ecinc-cloud-moadesktop 9.7.3 → 9.7.6

package/lib/ecmoadesktop.common.js

@@ -336,6 +336,11 @@ function curLocationAndDis(timeSpanData) {
   var device = js_cookie__WEBPACK_IMPORTED_MODULE_0___default().get('device');
   return new Promise(function (resolve) {
     var locationed = false;
+
+    // 【超时保护】兜底30秒超时，防止原生GPS回调不触发或H5定位卡住导致Promise永远挂起
+    setTimeout(function () {
+      if (!locationed) resolve(false);
+    }, 30000);
     var kqdkDis = sessionStorage.getItem('kqdk-dis');
     if (kqdkDis) {
       kqdkDis = JSON.parse(kqdkDis);
@@ -372,6 +377,10 @@ function curLocationAndDis(timeSpanData) {
       }
     }
     if (!locationed) {
+      // 懒初始化：天地图SDK以async方式加载，模块执行时window.T可能尚未就绪
+      if (!lo && window.T) {
+        lo = new T.Geolocation();
+      }
       if (!lo) {
         //天地图服务加载失败
         resolve(false);
@@ -581,6 +590,20 @@ var defaultMethods = {
         $parent.$toast.fail(err);
       });
     });
+  },
+  /**
+   * 重置模块级定位状态（供外部在会话切换时调用）
+   * 仅在新会话（退出登录再登录、切换用户）时调用，正常页面返回时不调用以保留缓存
+   */
+  resetState: function resetState() {
+    dis = null;
+    p2 = null;
+    gpsScope = null;
+    dkAddr = null;
+    curAddress = null;
+    timeSpanData = null;
+    $parent = '';
+    loginUser = '';
   }
 };
 /* harmony default export */ __webpack_exports__["default"] = (defaultMethods);
@@ -608,7 +631,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-78076e13] .van-nav-bar .van-ic
 
 /***/ }),
 
-/***/ 3277:
+/***/ 9173:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -622,7 +645,7 @@ __webpack_require__.r(__webpack_exports__);
 
 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()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-12920fa9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%}.no-data span[data-v-12920fa9]{color:#999;font-size:13px}#msg-notices[data-v-12920fa9]{position:relative;width:100%;max-height:243px;background:#fff;-webkit-box-shadow:0 0 6px 0 rgba(0,0,0,.06);box-shadow:0 0 6px 0 rgba(0,0,0,.06);border-radius:6px}#msg-notices .msg-notices-title[data-v-12920fa9]{height:44px;-webkit-box-sizing:border-box;box-sizing:border-box;border-bottom:1px solid #ebedf0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0 14px}#msg-notices .msg-notices-title span[data-v-12920fa9]{font-size:14px;font-family:PingFangSC-Semibold,PingFang SC}#msg-notices .msg-notices-content[data-v-12920fa9]{height:calc(100% - 44px);overflow:hidden}#msg-notices .msg-notices-content .msg-notice-item[data-v-12920fa9]{display:-webkit-box;display:-ms-flexbox;display:flex;height:66px;width:100%;font-family:PingFangSC-Semibold,PingFang SC;padding:0 14px;color:#333;position:relative;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-sizing:border-box;box-sizing:border-box}#msg-notices .msg-notices-content .msg-notice-item[data-v-12920fa9]:last-child{border-bottom:none}#msg-notices .msg-notices-content .msg-notice-item .left[data-v-12920fa9]{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:70px;height:50px;background:#f7f9fc;border-radius:2px;border:1px solid #dfe8fb}#msg-notices .msg-notices-content .msg-notice-item .left[data-v-12920fa9],#msg-notices .msg-notices-content .msg-notice-item .right[data-v-12920fa9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}#msg-notices .msg-notices-content .msg-notice-item .right[data-v-12920fa9]{width:calc(100% - 84px);font-size:14px;color:#333}#msg-notices .msg-notices-content .msg-notice-item .right span[data-v-12920fa9]{font-size:14px;color:#333;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;word-wrap:break-word;line-height:22px}#msg-notices .msg-notices-content .msg-notice-item .right .no-read-dot[data-v-12920fa9]{display:inline-block;width:6px;height:6px;border-radius:50%;background:red;margin-right:4px;vertical-align:middle}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-9020d874]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%}.no-data span[data-v-9020d874]{color:#999;font-size:13px}#msg-notices[data-v-9020d874]{position:relative;width:100%;max-height:243px;background:#fff;-webkit-box-shadow:0 0 6px 0 rgba(0,0,0,.06);box-shadow:0 0 6px 0 rgba(0,0,0,.06);border-radius:6px}#msg-notices .msg-notices-title[data-v-9020d874]{height:44px;-webkit-box-sizing:border-box;box-sizing:border-box;border-bottom:1px solid #ebedf0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0 14px}#msg-notices .msg-notices-title span[data-v-9020d874]{font-size:14px;font-family:PingFangSC-Semibold,PingFang SC}#msg-notices .msg-notices-content[data-v-9020d874]{height:calc(100% - 44px);overflow:hidden}#msg-notices .msg-notices-content .msg-notice-item[data-v-9020d874]{display:-webkit-box;display:-ms-flexbox;display:flex;height:66px;width:100%;font-family:PingFangSC-Semibold,PingFang SC;padding:0 14px;color:#333;position:relative;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-sizing:border-box;box-sizing:border-box}#msg-notices .msg-notices-content .msg-notice-item[data-v-9020d874]:last-child{border-bottom:none}#msg-notices .msg-notices-content .msg-notice-item .left[data-v-9020d874]{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:70px;height:50px;background:#f7f9fc;border-radius:2px;border:1px solid #dfe8fb}#msg-notices .msg-notices-content .msg-notice-item .left[data-v-9020d874],#msg-notices .msg-notices-content .msg-notice-item .right[data-v-9020d874]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}#msg-notices .msg-notices-content .msg-notice-item .right[data-v-9020d874]{width:calc(100% - 84px);font-size:14px;color:#333}#msg-notices .msg-notices-content .msg-notice-item .right span[data-v-9020d874]{font-size:14px;color:#333;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;word-wrap:break-word;line-height:22px}#msg-notices .msg-notices-content .msg-notice-item .right .no-read-dot[data-v-9020d874]{display:inline-block;width:6px;height:6px;border-radius:50%;background:red;margin-right:4px;vertical-align:middle}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -692,7 +715,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-ef203e2e]{display:-web
 
 /***/ }),
 
-/***/ 9673:
+/***/ 7111:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -711,7 +734,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-168b001e] .van-ellipsis{font-size:18px;color:#fff}[data-v-168b001e] .van-dropdown-menu__title{color:#fff!important;padding:0 8px 0 0!important}[data-v-168b001e] .van-dropdown-menu .van-dropdown-menu__bar .van-dropdown-menu__title--active{color:#fff!important}[data-v-168b001e] .van-dropdown-menu__title:after{border-color:transparent transparent #fff #fff!important;right:0}[data-v-168b001e] .van-dropdown-menu__bar{background-color:unset!important;-webkit-box-shadow:unset!important;box-shadow:unset!important}[data-v-168b001e] .van-dropdown-menu__item{-webkit-box-pack:left;-ms-flex-pack:left;justify-content:left}[data-v-168b001e] .chat_icon .van-info{top:5px!important;right:-4px!important}.work_pageHeader[data-v-168b001e]{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-168b001e],.work_pageHeader .flex-horizon-bw[data-v-168b001e]{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%}.work_pageHeader .flex-horizon-bw[data-v-168b001e]{-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-168b001e]{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-168b001e]{font-size:14px;margin-left:8px}.work_pageHeader .pageHeader_check_work[data-v-168b001e]{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-168b001e]{-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-168b001e]{position:relative;-webkit-transform:rotate(90deg);transform:rotate(90deg);font-size:10px;margin-left:6px}.check_time[data-v-168b001e]{-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-168b001e]{width:14px;height:14px}.check_time span[data-v-168b001e]{margin-left:5px}.check_button[data-v-168b001e]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;line-height:18px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "[data-v-b15ea618] .van-ellipsis{font-size:18px;color:#fff}[data-v-b15ea618] .van-dropdown-menu__title{color:#fff!important;padding:0 8px 0 0!important}[data-v-b15ea618] .van-dropdown-menu .van-dropdown-menu__bar .van-dropdown-menu__title--active{color:#fff!important}[data-v-b15ea618] .van-dropdown-menu__title:after{border-color:transparent transparent #fff #fff!important;right:0}[data-v-b15ea618] .van-dropdown-menu__bar{background-color:unset!important;-webkit-box-shadow:unset!important;box-shadow:unset!important}[data-v-b15ea618] .van-dropdown-menu__item{-webkit-box-pack:left;-ms-flex-pack:left;justify-content:left}[data-v-b15ea618] .chat_icon .van-info{top:5px!important;right:-4px!important}.work_pageHeader[data-v-b15ea618]{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-b15ea618],.work_pageHeader .flex-horizon-bw[data-v-b15ea618]{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%}.work_pageHeader .flex-horizon-bw[data-v-b15ea618]{-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-b15ea618]{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-b15ea618]{font-size:14px;margin-left:8px}.work_pageHeader .pageHeader_check_work[data-v-b15ea618]{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-b15ea618]{-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-b15ea618]{position:relative;-webkit-transform:rotate(90deg);transform:rotate(90deg);font-size:10px;margin-left:6px}.check_time[data-v-b15ea618]{-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-b15ea618]{width:14px;height:14px}.check_time span[data-v-b15ea618]{margin-left:5px}.check_button[data-v-b15ea618]{-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___);
 
@@ -865,7 +888,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "#work-setting[data-v-653165e4]{positio
 
 /***/ }),
 
-/***/ 7627:
+/***/ 1941:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -879,7 +902,7 @@ __webpack_require__.r(__webpack_exports__);
 
 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()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-7b49606c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%;margin-top:100px}.no-data span[data-v-7b49606c]{color:#999;font-size:13px}.work_pageContent[data-v-7b49606c]{min-height:360px;overflow:hidden;position:relative;border-radius:6px;background:#fff}.work_pageContent .tab-block[data-v-7b49606c]{height:44px}.work_pageContent .tab-type[data-v-7b49606c]{display:-webkit-box;display:-ms-flexbox;display:flex;height:44px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:#fff;border-bottom:1px solid #ebedf0;position:relative;z-index:9;padding:0 12px;gap:10px}.work_pageContent .tab-type .tab-item[data-v-7b49606c]{cursor:pointer;font-size:14px;font-family:PingFangSC-Semibold,PingFang SC;color:#999}.work_pageContent .tab-type .tab-active[data-v-7b49606c]{color:#333;font-weight:700}.work_pageContent .table-box[data-v-7b49606c]:after{content:\"\";position:absolute;bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:calc(100% - 28px);background:#ebedf0;height:1px}.work_pageContent .table-box[data-v-7b49606c]{height:68px;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:0 14px;font-family:PingFangSC-Regular,PingFang SC}.work_pageContent .table-box[data-v-7b49606c]:last-child{border-bottom:none}.work_pageContent .table-box .top[data-v-7b49606c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.work_pageContent .table-box .top .top-left[data-v-7b49606c]{font-size:14px;color:#333;font-weight:700;width:calc(100% - 100px);overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.work_pageContent .table-box .top .readed[data-v-7b49606c]{color:#999}.work_pageContent .table-box .top .top-right[data-v-7b49606c]{width:auto;padding:0 5px;height:20px;background:#e8f4ff;border-radius:2px;text-align:center;line-height:20px;font-size:12px;color:#409eff;max-width:70px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:inline-block}.work_pageContent .table-box .bottom[data-v-7b49606c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:12px;color:#999}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-6ca7c1e9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%;margin-top:100px}.no-data span[data-v-6ca7c1e9]{color:#999;font-size:13px}.work_pageContent[data-v-6ca7c1e9]{min-height:360px;overflow:hidden;position:relative;border-radius:6px;background:#fff}.work_pageContent .tab-block[data-v-6ca7c1e9]{height:44px}.work_pageContent .tab-type[data-v-6ca7c1e9]{display:-webkit-box;display:-ms-flexbox;display:flex;height:44px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:#fff;border-bottom:1px solid #ebedf0;position:relative;z-index:9;padding:0 12px;gap:10px}.work_pageContent .tab-type .tab-item[data-v-6ca7c1e9]{cursor:pointer;font-size:14px;font-family:PingFangSC-Semibold,PingFang SC;color:#999}.work_pageContent .tab-type .tab-active[data-v-6ca7c1e9]{color:#333;font-weight:700}.work_pageContent .table-box[data-v-6ca7c1e9]:after{content:\"\";position:absolute;bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:calc(100% - 28px);background:#ebedf0;height:1px}.work_pageContent .table-box[data-v-6ca7c1e9]{height:68px;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:0 14px;font-family:PingFangSC-Regular,PingFang SC}.work_pageContent .table-box[data-v-6ca7c1e9]:last-child{border-bottom:none}.work_pageContent .table-box .top[data-v-6ca7c1e9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.work_pageContent .table-box .top .top-left[data-v-6ca7c1e9]{font-size:14px;color:#333;font-weight:700;width:calc(100% - 100px);overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.work_pageContent .table-box .top .readed[data-v-6ca7c1e9]{color:#999}.work_pageContent .table-box .top .top-right[data-v-6ca7c1e9]{width:auto;padding:0 5px;height:20px;background:#e8f4ff;border-radius:2px;text-align:center;line-height:20px;font-size:12px;color:#409eff;max-width:70px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:inline-block}.work_pageContent .table-box .bottom[data-v-6ca7c1e9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:12px;color:#999}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -22712,19 +22735,19 @@ var update = add("a08e7c36", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 2755:
+/***/ 1007:
 /***/ (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__(3277);
+var content = __webpack_require__(9173);
 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("0760e1f4", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("659ace12", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -22776,19 +22799,19 @@ var update = add("b0496ae0", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 7371:
+/***/ 265:
 /***/ (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__(9673);
+var content = __webpack_require__(7111);
 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("7e9fc9cf", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("c1085532", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -22888,19 +22911,19 @@ var update = add("3274dc8a", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 4793:
+/***/ 351:
 /***/ (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__(7627);
+var content = __webpack_require__(1941);
 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("3b3803ba", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("010a4c71", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -23716,8 +23739,8 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var workTzgg = (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/workTodo.vue?vue&type=template&id=7b49606c&scoped=true
-var workTodovue_type_template_id_7b49606c_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/workTodo.vue?vue&type=template&id=6ca7c1e9&scoped=true
+var workTodovue_type_template_id_6ca7c1e9_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -23728,13 +23751,13 @@ var workTodovue_type_template_id_7b49606c_scoped_true_render = function render()
     staticClass: "tab-type"
   }, _vm._l(_vm.showTabList, function (tab) {
     return _c('div', {
-      key: tab.value,
+      key: tab.code,
       staticClass: "tab-item",
-      class: _vm.formType === tab.value ? 'tab-active' : '',
+      class: _vm.formType === tab.code ? 'tab-active' : '',
       on: {
         "click": function click($event) {
           $event.stopPropagation();
-          return _vm.handleTypeChangeOne(tab.value);
+          return _vm.handleTypeChangeOne(tab.code);
         }
       }
     }, [_c('span', [_vm._v(_vm._s(tab.title))]), tab.count > 0 ? _c('span', {
@@ -23742,7 +23765,7 @@ var workTodovue_type_template_id_7b49606c_scoped_true_render = function render()
         "margin-left": "2px"
       },
       style: {
-        color: _vm.formType === tab.value ? 'red' : ''
+        color: _vm.formType === tab.code ? 'red' : ''
       }
     }, [_vm._v(" " + _vm._s(tab.count != '0' ? "(".concat(_vm.formatCount(tab.count), ")") : ''))]) : _vm._e()]);
   }), 0) : _vm._e()]), _vm.list.length > 0 ? [_vm._l(_vm.list, function (item) {
@@ -23761,13 +23784,13 @@ var workTodovue_type_template_id_7b49606c_scoped_true_render = function render()
       class: {
         readed: item.openTime
       }
-    }, [_vm._v(_vm._s(item.title))]), _c('span', {
+    }, [_vm._v(_vm._s(_vm.isCuiban ? item.cbContent : item.title))]), _c('span', {
       staticClass: "top-right"
-    }, [_vm._v(_vm._s(item.wfName))])]), _c('div', {
+    }, [_vm._v(_vm._s(_vm.isCuiban ? item.wfNodeNames : item.wfName))])]), _c('div', {
       staticClass: "bottom"
     }, [_c('div', {
       staticClass: "bottom-left"
-    }, [_c('span', [_vm._v(_vm._s(item.senderName))]), _c('span', {
+    }, [_c('span', [_vm._v(_vm._s(_vm.isCuiban ? item.cbPerson : item.senderName))]), _c('span', {
       staticStyle: {
         "margin": "0 2px"
       }
@@ -23826,7 +23849,7 @@ var workTodovue_type_template_id_7b49606c_scoped_true_render = function render()
     }]
   }, [_vm._v("暂无数据~")])]) : _vm._e()], 2);
 };
-var workTodovue_type_template_id_7b49606c_scoped_true_staticRenderFns = [];
+var workTodovue_type_template_id_6ca7c1e9_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/moment/moment.js
 var moment = __webpack_require__(5093);
@@ -23842,31 +23865,12 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-var form_enum = {
-  0: {
-    listDataUrl: '/workflow/wfTaskItem/listdata?listpageViewUrl=workflow.wfTaskItem.myTodo'
-  },
-  1: {
-    listDataUrl: '/workflow/wfTaskItem/listdata?busiType=gwgl&listpageViewUrl=workflow.wfTaskItem.myTodo'
-  },
-  2: {
-    listDataUrl: '/workflow/wfTaskItem/listdata?busiType=hygl&listpageViewUrl=workflow.wfTaskItem.myTodo'
-  },
-  3: {
-    listDataUrl: '/workflow/wfTaskItem/listdata?busiType=other&listpageViewUrl=workflow.wfTaskItem.myTodo'
-  },
-  4: {
-    listDataUrl: '/workflow/wfTaskItem/listdata?listpageViewUrl=workflow.wfTaskItem.myToread'
-  }
-};
-var todo_form_enum = {
-  0: {
-    listDataUrl: '/workflow/wfTaskItem/listdata?listpageViewUrl=workflow.wfTaskItem.myTodo'
-  },
-  1: {
-    listDataUrl: '/workflow/wfTaskItem/listdata?listpageViewUrl=workflow.wfTaskItem.myToread'
-  }
-};
+/**
+ * 工作台-待办事项
+ * 手机门户定义--待办列表--应用子路由：tabTitle定义待办分类标签，通过code值与formTypeTabs关联
+ * 手机门户定义--待办列表--应用子路由：wfItemTabs，已废弃，不需要定义
+ */
+
 
 /* harmony default export */ var workTodovue_type_script_lang_js = ({
   components: {},
@@ -23882,47 +23886,69 @@ var todo_form_enum = {
     return {
       haveGwgl: false,
       showNum: false,
-      formType: '0',
+      formType: 'all',
       pageNum: 1,
-      url: {
-        listDataUrl: '/workflow/wfTaskItem/listdata?listpageViewUrl=workflow.wfTaskItem.myTodo'
-      },
       formTypeTabs: [{
         title: this.$tx('desktop.components.latestToDoList', '最新待办'),
         value: '0',
         code: 'all',
-        count: 0
+        count: 0,
+        listDataUrl: '/workflow/wfTaskItem/listdata?listpageViewUrl=workflow.wfTaskItem.myTodo'
+      }, {
+        title: this.$tx('desktop.components.toDoList', '待办'),
+        value: '0',
+        code: 'todo',
+        count: 0,
+        listDataUrl: '/workflow/wfTaskItem/listdata?listpageViewUrl=workflow.wfTaskItem.myTodo'
       }, {
         title: this.$tx('desktop.components.officeDocument', '办文'),
         value: '1',
         code: 'gwgl',
-        count: 0
+        count: 0,
+        listDataUrl: '/workflow/wfTaskItem/listdata?busiType=gwgl&listpageViewUrl=workflow.wfTaskItem.myTodo'
       }, {
-        title: this.$tx('desktop.components.holdWork', '办事'),
+        title: this.$tx('desktop.components.HoldMeeting', '办会'),
         value: '2',
-        code: 'other',
-        count: 0
+        code: 'hygl',
+        count: 0,
+        listDataUrl: '/workflow/wfTaskItem/listdata?busiType=hygl&listpageViewUrl=workflow.wfTaskItem.myTodo'
       }, {
-        title: this.$tx('desktop.components.HoldMeeting', '办会'),
+        title: this.$tx('desktop.components.holdWork', '办事'),
         value: '3',
+        code: 'other',
         count: 0,
-        code: 'hygl'
+        listDataUrl: '/workflow/wfTaskItem/listdata?busiType=other&listpageViewUrl=workflow.wfTaskItem.myTodo'
       }, {
         title: this.$tx('common.myToread', '待阅'),
         value: '4',
+        code: 'toRead',
         count: 0,
-        code: 'toRead'
+        listDataUrl: '/workflow/wfTaskItem/listdata?listpageViewUrl=workflow.wfTaskItem.myToread'
+      }, {
+        title: this.$tx('common.cuiban', '催办'),
+        value: '5',
+        code: 'cuiban',
+        count: 0,
+        listDataUrl: '/cuiban/cbjsjl/listdata?listpageViewUrl=cuiban.cbjsjl.list'
       }],
       todoFormTypeTabs: [{
         title: this.$tx('common.myTodo', '待办'),
         value: '0',
+        code: 'todo',
         count: 0,
-        code: 'todo'
+        listDataUrl: '/workflow/wfTaskItem/listdata?listpageViewUrl=workflow.wfTaskItem.myTodo'
       }, {
         title: this.$tx('common.myToread', '待阅'),
         value: '1',
+        code: 'toRead',
         count: 0,
-        code: 'toRead'
+        listDataUrl: '/workflow/wfTaskItem/listdata?listpageViewUrl=workflow.wfTaskItem.myToread'
+      }, {
+        title: this.$tx('common.cuiban', '催办'),
+        value: '2',
+        code: 'cuiban',
+        count: 0,
+        listDataUrl: '/cuiban/cbjsjl/listdata?listpageViewUrl=cuiban.cbjsjl.list'
       }],
       list: [],
       total: 0,
@@ -23931,6 +23957,13 @@ var todo_form_enum = {
     };
   },
   computed: {
+    isCuiban: function isCuiban() {
+      var _this = this;
+      var tab = this.showTabList.find(function (t) {
+        return t.code === _this.formType;
+      });
+      return tab && (tab.code === 'cuiban' || tab.code === 'caiban');
+    },
     showTabList: function showTabList() {
       if (this.haveGwgl && this.showNum) {
         return [].concat(_toConsumableArray(this.formTypeTabs), _toConsumableArray(this.tabList));
@@ -23963,7 +23996,7 @@ var todo_form_enum = {
         tabEl.style.top = pageHeaderEl.clientHeight + 'px';
         tabEl.style.left = '0';
         tabEl.style.right = '0';
-      } else {
+      } else if (tabEl) {
         tabEl.style.position = 'relative';
         tabEl.style.top = '0';
       }
@@ -23976,7 +24009,7 @@ var todo_form_enum = {
       this.getData(this.formType);
     },
     cellClick: function cellClick(row) {
-      this.$router.push(row.itemUrl);
+      this.$router.push(row.itemUrl || row.wfEngineUrl);
     },
     clickMore: function clickMore() {
       this.pageNum++;
@@ -23984,72 +24017,32 @@ var todo_form_enum = {
     },
     // 获取待办数量
     getListCount: function getListCount() {
-      var _this = this;
-      if (this.haveGwgl) {
-        var busiCodesData = [];
-        if (this.appletData.appRoute) {
-          var formTypeTabs = JSON.parse(this.appletData.appRoute.replace(/\n/g, ''));
-          //console.log('🚀 ~ getListCount ~ formTypeTabs:', formTypeTabs)
-          if (formTypeTabs.length > 0) {
-            var arrayData = formTypeTabs[0].tabTitle;
-            this.formTypeTabs = arrayData;
-            if (this.formTypeTabs.length > 0) {
-              this.formTypeTabs.forEach(function (item) {
-                busiCodesData.push(item.code);
-              });
-            }
-          } else {
-            if (this.formTypeTabs.length > 0) {
-              this.formTypeTabs.forEach(function (item) {
-                busiCodesData.push(item.code);
-              });
-            }
-          }
-          this.$http({
-            url: '/base/apiWfEngine/findOwnerTaskSysTypeCount',
-            method: 'get',
-            params: {
-              resType: '',
-              busiTypes: busiCodesData.join(',')
-            }
-          }).then(function (res) {
-            if (res.code === 'success') {
-              if (res.body.resList.length > 0) {
-                _this.formTypeTabs.forEach(function (item) {
-                  res.body.resList.forEach(function (val) {
-                    if (item.code === val.code) {
-                      item.count = val.count;
-                    }
-                  });
-                });
-              }
-            }
-            _this.showNum = true;
-          });
+      var _this2 = this;
+      var tabs = this.haveGwgl ? this.formTypeTabs : this.todoFormTypeTabs;
+      var busiCodesData = tabs.map(function (item) {
+        return item.code;
+      });
+      this.$http({
+        url: '/base/apiWfEngine/findOwnerTaskSysTypeCount',
+        method: 'get',
+        params: {
+          resType: '',
+          busiTypes: busiCodesData.join(',')
         }
-      } else {
-        this.$http({
-          url: '/base/apiWfEngine/findOwnerTaskSysTypeCount',
-          method: 'get',
-          params: {
-            resType: '1',
-            busiTypes: ''
-          }
-        }).then(function (res) {
-          if (res.code === 'success') {
-            if (res.body.resList.length > 0) {
-              _this.todoFormTypeTabs.forEach(function (item) {
-                res.body.resList.forEach(function (val) {
-                  if (item.code === val.code) {
-                    item.count = val.count;
-                  }
-                });
+      }).then(function (res) {
+        if (res.code === 'success') {
+          if (res.body.resList.length > 0) {
+            tabs.forEach(function (item) {
+              res.body.resList.forEach(function (val) {
+                if (item.code === val.code) {
+                  item.count = val.count;
+                }
               });
-            }
+            });
           }
-          _this.showNum = true;
-        });
-      }
+        }
+        _this2.showNum = true;
+      });
       this.getUnreadEmail(true);
     },
     // 列表tab切换
@@ -24061,13 +24054,10 @@ var todo_form_enum = {
       this.getNum();
     },
     getNum: function getNum() {
-      var _this2 = this;
-      var busiCodesData = [];
-      if (this.formTypeTabs.length > 0) {
-        this.formTypeTabs.forEach(function (item) {
-          busiCodesData.push(item.code);
-        });
-      }
+      var tabs = this.haveGwgl ? this.formTypeTabs : this.todoFormTypeTabs;
+      var busiCodesData = tabs.map(function (item) {
+        return item.code;
+      });
       this.$http({
         url: '/base/apiWfEngine/findOwnerTaskSysTypeCount',
         method: 'get',
@@ -24078,7 +24068,7 @@ var todo_form_enum = {
       }).then(function (res) {
         if (res.code === 'success') {
           if (res.body.resList.length > 0) {
-            _this2.formTypeTabs.forEach(function (item) {
+            tabs.forEach(function (item) {
               res.body.resList.forEach(function (val) {
                 if (item.code === val.code) {
                   item.count = val.count;
@@ -24102,50 +24092,78 @@ var todo_form_enum = {
           this.haveGwgl = true;
         }
       }
-      if (this.haveGwgl) {
-        this.url = form_enum;
-      } else {
-        this.url = todo_form_enum;
-      }
       if (this.appletData.appRoute) {
-        var appRoute = JSON.parse(this.appletData.appRoute.replace(/\n/g, ''));
+        var route = this.appletData.appRoute.replace(/\n/g, '').replace(/\t/g, '').replace(/,\s*([\]}])/g, '$1');
+        var appRoute = JSON.parse(route);
         if (Array.isArray(appRoute) && appRoute.length > 0) {
-          if (appRoute[0].tabList && Array.isArray(appRoute[0].tabList) && appRoute[0].tabList.length > 0) {
-            this.tabList = appRoute[0].tabList;
+          var config = appRoute[0];
+          // 按code从默认tab定义中保留listDataUrl
+          if (config.tabTitle && Array.isArray(config.tabTitle) && config.tabTitle.length > 0) {
+            var defaultTabs = this.haveGwgl ? this.formTypeTabs : this.todoFormTypeTabs;
+            this.formTypeTabs = config.tabTitle.map(function (tab) {
+              var defaultTab = defaultTabs.find(function (d) {
+                return d.code === tab.code;
+              });
+              if (defaultTab && defaultTab.listDataUrl) {
+                tab.listDataUrl = defaultTab.listDataUrl;
+              }
+              return tab;
+            });
+          }
+          if (config.tabList && Array.isArray(config.tabList) && config.tabList.length > 0) {
+            this.tabList = config.tabList;
           }
         }
       }
+      if (this.formTypeTabs.length > 0) {
+        this.formType = this.formTypeTabs[0].code;
+      }
       this.getData(this.formType);
       this.getListCount();
     },
     getData: function getData(type) {
       var _this3 = this;
       return workTodovue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/workTodovue_type_script_lang_js_regeneratorRuntime().mark(function _callee() {
+        var tabs, tab;
         return workTodovue_type_script_lang_js_regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (type == 'email') {
-                _this3.getUnreadEmail(false);
-              } else {
-                _this3.$app.listdata(_this3.url[type].listDataUrl, {
-                  pageNum: _this3.pageNum,
-                  pageSize: 4
-                }).then(function (res) {
-                  if (res.code === 'success') {
-                    if (res.body.pageInfo.list.length > 0) {
-                      _this3.total = res.body.pageInfo.total;
-                      _this3.endRow = res.body.pageInfo.endRow;
-                      res.body.pageInfo.list.forEach(function (item) {
-                        item.createTime = moment_default()(item.createTime).format('YYYY-MM-DD HH:mm');
-                        _this3.list.push(item);
-                      });
-                    }
-                  } else {
-                    _this3.list = [];
-                  }
-                });
+              if (!(type == 'email')) {
+                _context.next = 4;
+                break;
               }
-            case 1:
+              _this3.getUnreadEmail(false);
+              _context.next = 9;
+              break;
+            case 4:
+              tabs = _this3.haveGwgl ? _this3.formTypeTabs : _this3.todoFormTypeTabs;
+              tab = tabs.find(function (t) {
+                return t.code === type;
+              });
+              if (!(!tab || !tab.listDataUrl)) {
+                _context.next = 8;
+                break;
+              }
+              return _context.abrupt("return");
+            case 8:
+              _this3.$app.listdata(tab.listDataUrl, {
+                pageNum: _this3.pageNum,
+                pageSize: 4
+              }).then(function (res) {
+                if (res.code === 'success') {
+                  if (res.body.pageInfo.list.length > 0) {
+                    _this3.total = res.body.pageInfo.total;
+                    _this3.endRow = res.body.pageInfo.endRow;
+                    res.body.pageInfo.list.forEach(function (item) {
+                      item.createTime = moment_default()(item.createTime).format('YYYY-MM-DD HH:mm');
+                      _this3.list.push(item);
+                    });
+                  }
+                } else {
+                  _this3.list = [];
+                }
+              });
+            case 9:
             case "end":
               return _context.stop();
           }
@@ -24257,9 +24275,9 @@ var todo_form_enum = {
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=script&lang=js
  /* harmony default export */ var components_workTodovue_type_script_lang_js = (workTodovue_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/workTodo.vue?vue&type=style&index=0&id=7b49606c&prod&scoped=true&lang=scss
-var workTodovue_type_style_index_0_id_7b49606c_prod_scoped_true_lang_scss = __webpack_require__(4793);
-;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=style&index=0&id=7b49606c&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/workTodo.vue?vue&type=style&index=0&id=6ca7c1e9&prod&scoped=true&lang=scss
+var workTodovue_type_style_index_0_id_6ca7c1e9_prod_scoped_true_lang_scss = __webpack_require__(351);
+;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue?vue&type=style&index=0&id=6ca7c1e9&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTodo.vue
 
@@ -24272,11 +24290,11 @@ var workTodovue_type_style_index_0_id_7b49606c_prod_scoped_true_lang_scss = __we
 
 var workTodo_component = normalizeComponent(
   components_workTodovue_type_script_lang_js,
-  workTodovue_type_template_id_7b49606c_scoped_true_render,
-  workTodovue_type_template_id_7b49606c_scoped_true_staticRenderFns,
+  workTodovue_type_template_id_6ca7c1e9_scoped_true_render,
+  workTodovue_type_template_id_6ca7c1e9_scoped_true_staticRenderFns,
   false,
   null,
-  "7b49606c",
+  "6ca7c1e9",
   null
   
 )
@@ -27960,8 +27978,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=168b001e&scoped=true
-var workHeadvue_type_template_id_168b001e_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=b15ea618&scoped=true
+var workHeadvue_type_template_id_b15ea618_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -28085,7 +28103,7 @@ var workHeadvue_type_template_id_168b001e_scoped_true_render = function render()
     staticClass: "pageHeader_timer"
   }, [_c('span', [_vm._v(_vm._s(_vm.nowDay))])])])]);
 };
-var workHeadvue_type_template_id_168b001e_scoped_true_staticRenderFns = [];
+var workHeadvue_type_template_id_b15ea618_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/vuex/dist/vuex.esm.js
 /*!
@@ -29327,19 +29345,53 @@ var workClock = __webpack_require__(2396);
   },
   mounted: function mounted() {
     var _this2 = this;
-    this.loadH5apps();
+    // 首次加载：初始化时钟、日期、打卡定位
+    // Vue 2 keep-alive中activated在首次创建时可能不触发，因此首次初始化必须在mounted中完成
     this.formatNowDay();
     this.getTime();
     this.timer = setInterval(function () {
       _this2.getTime();
     }, 1000 * 2);
+    this._clockPersonId = this.loginUser && this.loginUser.personId;
+    this.loadH5apps();
+  },
+  activated: function activated() {
+    var _this3 = this;
+    // 后续激活（从其它页面返回）：mounted不再触发，由此钩子处理
+    // 首次创建时mounted已处理初始化，通过this.timer判断是否为后续激活
+    if (!this.timer) {
+      // 兑底：如果mounted未执行（异常情况），在此补初始化
+      this.formatNowDay();
+      this.getTime();
+      this.timer = setInterval(function () {
+        _this3.getTime();
+      }, 1000 * 2);
+      this._clockPersonId = this.loginUser && this.loginUser.personId;
+      this.loadH5apps();
+      return;
+    }
+
+    // 检测是否为新会话（退出登录再登录、或切换用户）
+    var currentPersonId = this.loginUser && this.loginUser.personId;
+    if (this._clockPersonId !== currentPersonId) {
+      // 新会话：重置work-clock模块级定位状态，清除旧的定位缓存，强制重新定位
+      if (workClock.resetState) workClock.resetState();
+      sessionStorage.removeItem('kqdk-dis');
+      this.dakaType = '正在定位';
+      if (this.curInterval) {
+        clearInterval(this.curInterval);
+        this.curInterval = '';
+      }
+    }
+    this._clockPersonId = currentPersonId;
+    this.loadH5apps();
   },
   methods: {
     scan: function scan() {
-      var _this3 = this;
+      var _this4 = this;
       this.$wv.getScanInfo(function (obj) {
         if (/(http|https):\/\/([\w.]+\/?)\S*/.test(obj.result)) {
-          _this3.$wv.openHorizontalWeb({
+          _this4.$wv.openHorizontalWeb({
             url: obj.result + '&isFullScreen=true',
             title: '',
             showTopBar: 'true'
@@ -29347,19 +29399,19 @@ var workClock = __webpack_require__(2396);
         }
         if (/(mappShareToken)/.test(obj.result)) {
           var id = obj.result.split('/').pop();
-          _this3.$http({
+          _this4.$http({
             url: '/qrCodeLogin/mappShareToken/' + id,
             method: 'GET'
           }).then(function (res) {
             if (res.code !== 'success') {
-              _this3.$toast.fail(res.message);
+              _this4.$toast.fail(res.message);
             }
           });
         }
       });
     },
     getBgImg: function getBgImg() {
-      var _this4 = this;
+      var _this5 = this;
       return workHeadvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/workHeadvue_type_script_lang_js_regeneratorRuntime().mark(function _callee() {
         var curTime, searchFields, orderBy, count, res, productCode, url;
         return workHeadvue_type_script_lang_js_regeneratorRuntime().wrap(function _callee$(_context) {
@@ -29390,7 +29442,7 @@ var workClock = __webpack_require__(2396);
               orderBy = 'startTime';
               count = 1;
               _context.next = 6;
-              return _this4.$app.querydata('mpp/image/querydata', searchFields, orderBy, count);
+              return _this5.$app.querydata('mpp/image/querydata', searchFields, orderBy, count);
             case 6:
               res = _context.sent;
               if (res.code === 'success' && res.body.listdata.length > 0) {
@@ -29460,7 +29512,7 @@ var workClock = __webpack_require__(2396);
       });
     },
     loadH5apps: function loadH5apps() {
-      var _this5 = this;
+      var _this6 = this;
       var productList = this.$store.getters.productCodeList;
       if (!productList) return;
       var h5apps = this.routes.filter(function (route) {
@@ -29474,22 +29526,22 @@ var workClock = __webpack_require__(2396);
               if (res.code === 'success') {
                 var openModules = res.body['EXT_MODULE_CODE_LIST']; //EXT_MODULE_CODE_LIST 有则是开启的模块
 
-                _this5.openSignIn = openModules.includes('kqdk');
-                if (_this5.openSignIn) {
-                  _this5.ecykqPath = mapp.routeTo;
-                  _this5.canClockIn = true;
-                  _this5.$nextTick(function () {
+                _this6.openSignIn = openModules.includes('kqdk');
+                if (_this6.openSignIn) {
+                  _this6.ecykqPath = mapp.routeTo;
+                  _this6.canClockIn = true;
+                  _this6.$nextTick(function () {
                     if (workClock.freshData) {
-                      workClock.freshData(_this5);
+                      workClock.freshData(_this6);
                     } else if (workClock.default) {
-                      workClock.default.freshData(_this5);
+                      workClock.default.freshData(_this6);
                     }
-                    _this5.curInterval = setInterval(function () {
-                      if (_this5.$route.path == '/main') {
+                    _this6.curInterval = setInterval(function () {
+                      if (_this6.$route.path == '/main') {
                         if (workClock.freshData) {
-                          workClock.freshData(_this5);
+                          workClock.freshData(_this6);
                         } else if (workClock.default) {
-                          workClock.default.freshData(_this5);
+                          workClock.default.freshData(_this6);
                         }
                       }
                     }, 1000 * 60);
@@ -29530,7 +29582,7 @@ var workClock = __webpack_require__(2396);
       this.nowDay = moment_default()(new Date()).format('MM月DD日') + ' ' + weeks[new Date().getDay()];
     },
     organChange: function organChange(orgCode) {
-      var _this6 = this;
+      var _this7 = this;
       this.$http({
         method: 'GET',
         url: 'base/sysSetup/switchOrgLogin',
@@ -29542,21 +29594,21 @@ var workClock = __webpack_require__(2396);
         }
       }).then(function (response) {
         if (response.code === 'success') {
-          _this6.$store.dispatch('user/tokenSsoLogin', response.body).then( /*#__PURE__*/function () {
+          _this7.$store.dispatch('user/tokenSsoLogin', response.body).then( /*#__PURE__*/function () {
             var _ref = workHeadvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/workHeadvue_type_script_lang_js_regeneratorRuntime().mark(function _callee2(res) {
               var url;
               return workHeadvue_type_script_lang_js_regeneratorRuntime().wrap(function _callee2$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
                     _context2.next = 2;
-                    return _this6.$store.dispatch('route/updateRoutes', []);
+                    return _this7.$store.dispatch('route/updateRoutes', []);
                   case 2:
                     _context2.next = 4;
-                    return _this6.$store.dispatch('tagsView/delAllViews');
+                    return _this7.$store.dispatch('tagsView/delAllViews');
                   case 4:
                     url = location.href.split('#');
                     location.replace(url[0]);
-                    _this6.$bus.emit('getWaterMarkConfig');
+                    _this7.$bus.emit('getWaterMarkConfig');
                   case 7:
                   case "end":
                     return _context2.stop();
@@ -29567,10 +29619,10 @@ var workClock = __webpack_require__(2396);
               return _ref.apply(this, arguments);
             };
           }()).catch(function (error) {
-            _this6.$toast.fail(error.message);
+            _this7.$toast.fail(error.message);
           });
         } else {
-          _this6.$toast.fail(response.message);
+          _this7.$toast.fail(response.message);
         }
       });
     },
@@ -29594,9 +29646,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=168b001e&prod&scoped=true&lang=scss
-var workHeadvue_type_style_index_0_id_168b001e_prod_scoped_true_lang_scss = __webpack_require__(7371);
-;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=168b001e&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=b15ea618&prod&scoped=true&lang=scss
+var workHeadvue_type_style_index_0_id_b15ea618_prod_scoped_true_lang_scss = __webpack_require__(265);
+;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue?vue&type=style&index=0&id=b15ea618&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workHead.vue
 
@@ -29609,11 +29661,11 @@ var workHeadvue_type_style_index_0_id_168b001e_prod_scoped_true_lang_scss = __we
 
 var workHead_component = normalizeComponent(
   components_workHeadvue_type_script_lang_js,
-  workHeadvue_type_template_id_168b001e_scoped_true_render,
-  workHeadvue_type_template_id_168b001e_scoped_true_staticRenderFns,
+  workHeadvue_type_template_id_b15ea618_scoped_true_render,
+  workHeadvue_type_template_id_b15ea618_scoped_true_staticRenderFns,
   false,
   null,
-  "168b001e",
+  "b15ea618",
   null
   
 )
@@ -30181,8 +30233,8 @@ var workWdzx_component = normalizeComponent(
 )
 
 /* harmony default export */ var workWdzx = (workWdzx_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/msgNotices.vue?vue&type=template&id=12920fa9&scoped=true
-var msgNoticesvue_type_template_id_12920fa9_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/msgNotices.vue?vue&type=template&id=9020d874&scoped=true
+var msgNoticesvue_type_template_id_9020d874_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -30386,7 +30438,7 @@ var msgNoticesvue_type_template_id_12920fa9_scoped_true_render = function render
     }
   }, [_vm._v("下一条")])])]) : _vm._e()])], 1);
 };
-var msgNoticesvue_type_template_id_12920fa9_scoped_true_staticRenderFns = [];
+var msgNoticesvue_type_template_id_9020d874_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/msgNotices.vue?vue&type=script&lang=js
 /* harmony default export */ var msgNoticesvue_type_script_lang_js = ({
@@ -30439,19 +30491,57 @@ var msgNoticesvue_type_template_id_12920fa9_scoped_true_staticRenderFns = [];
       });
       if (this.noticeIndex < 0) this.noticeIndex = 0;
       this.showDialog = true;
+      if (item.isRead !== 1) {
+        this.markAsRead(item);
+      }
     },
     prevNotice: function prevNotice() {
-      if (this.noticeIndex > 0) this.noticeIndex--;
+      var _this = this;
+      if (this.noticeIndex > 0) {
+        var prevItem = this.list[this.noticeIndex - 1];
+        if (prevItem.isRead !== 1) {
+          this.markAsRead(prevItem).then(function () {
+            _this.noticeIndex--;
+          });
+        } else {
+          this.noticeIndex--;
+        }
+      }
     },
     nextNotice: function nextNotice() {
-      if (this.noticeIndex < this.list.length - 1) this.noticeIndex++;
+      var _this2 = this;
+      if (this.noticeIndex < this.list.length - 1) {
+        var nextItem = this.list[this.noticeIndex + 1];
+        if (nextItem.isRead !== 1) {
+          this.markAsRead(nextItem).then(function () {
+            _this2.noticeIndex++;
+          });
+        } else {
+          this.noticeIndex++;
+        }
+      }
     },
     gotoDetail: function gotoDetail(item) {
       this.showDialog = false;
       this.$router.push(item.msgUrl);
     },
+    markAsRead: function markAsRead(item) {
+      var _this3 = this;
+      return this.$http({
+        method: 'GET',
+        url: '/message/inbox/readMsg',
+        params: {
+          id: item.id
+        }
+      }).then(function (res) {
+        if (res.code == 'success') {
+          item.isRead = 1;
+          _this3.$bus.emit('updateTopBarMessageTotal');
+        }
+      });
+    },
     getData: function getData() {
-      var _this = this;
+      var _this4 = this;
       var loginUser = this.$store.getters.loginUser;
       this.$app.listdata('message/vwInbox/listdata', {
         pageSize: 5,
@@ -30460,9 +30550,9 @@ var msgNoticesvue_type_template_id_12920fa9_scoped_true_staticRenderFns = [];
         urlsearch: 'pushStatus:1;msgContent!:null;receiverAccount:' + loginUser.personAccount
       }).then(function (resp) {
         if (resp.code === 'success') {
-          _this.list = resp.body.pageInfo.list;
+          _this4.list = resp.body.pageInfo.list;
         } else {
-          _this.$toast.fail(resp.message);
+          _this4.$toast.fail(resp.message);
         }
       });
     }
@@ -30470,9 +30560,9 @@ var msgNoticesvue_type_template_id_12920fa9_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/msgNotices.vue?vue&type=script&lang=js
  /* harmony default export */ var components_msgNoticesvue_type_script_lang_js = (msgNoticesvue_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/msgNotices.vue?vue&type=style&index=0&id=12920fa9&prod&scoped=true&lang=scss
-var msgNoticesvue_type_style_index_0_id_12920fa9_prod_scoped_true_lang_scss = __webpack_require__(2755);
-;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/msgNotices.vue?vue&type=style&index=0&id=12920fa9&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/msgNotices.vue?vue&type=style&index=0&id=9020d874&prod&scoped=true&lang=scss
+var msgNoticesvue_type_style_index_0_id_9020d874_prod_scoped_true_lang_scss = __webpack_require__(1007);
+;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/msgNotices.vue?vue&type=style&index=0&id=9020d874&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/msgNotices.vue
 
@@ -30485,11 +30575,11 @@ var msgNoticesvue_type_style_index_0_id_12920fa9_prod_scoped_true_lang_scss = __
 
 var msgNotices_component = normalizeComponent(
   components_msgNoticesvue_type_script_lang_js,
-  msgNoticesvue_type_template_id_12920fa9_scoped_true_render,
-  msgNoticesvue_type_template_id_12920fa9_scoped_true_staticRenderFns,
+  msgNoticesvue_type_template_id_9020d874_scoped_true_render,
+  msgNoticesvue_type_template_id_9020d874_scoped_true_staticRenderFns,
   false,
   null,
-  "12920fa9",
+  "9020d874",
   null
   
 )