ecinc-cloud-moadesktop 9.7.12 → 9.7.14

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.
@@ -816,7 +816,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-cf6d8e06]{display:-web
816
816
 
817
817
  /***/ }),
818
818
 
819
- /***/ 8214:
819
+ /***/ 9817:
820
820
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
821
821
 
822
822
  "use strict";
@@ -830,7 +830,7 @@ __webpack_require__.r(__webpack_exports__);
830
830
 
831
831
  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()));
832
832
  // Module
833
- ___CSS_LOADER_EXPORT___.push([module.id, "#van-no[data-v-5a539700]{min-height:40px}", ""]);
833
+ ___CSS_LOADER_EXPORT___.push([module.id, "#van-no[data-v-5cb17588]{min-height:40px}", ""]);
834
834
  // Exports
835
835
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
836
836
 
@@ -909,7 +909,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-fc36d506]{display:-web
909
909
 
910
910
  /***/ }),
911
911
 
912
- /***/ 9425:
912
+ /***/ 8784:
913
913
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
914
914
 
915
915
  "use strict";
@@ -923,7 +923,7 @@ __webpack_require__.r(__webpack_exports__);
923
923
 
924
924
  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()));
925
925
  // Module
926
- ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-fecde4f4]{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-fecde4f4]{color:#999;font-size:13px}#work-tzgg[data-v-fecde4f4]{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}#work-tzgg .work-tzgg-title[data-v-fecde4f4]{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}#work-tzgg .work-tzgg-title span[data-v-fecde4f4]{font-size:14px;font-family:PingFangSC-Semibold,PingFang SC}#work-tzgg .work-tzgg-content[data-v-fecde4f4]{height:calc(100% - 44px);overflow:hidden}#work-tzgg .work-tzgg-content .tzgg-item[data-v-fecde4f4]{display:-webkit-box;display:-ms-flexbox;height:66px;width:100%;font-family:PingFangSC-Semibold,PingFang SC;padding:0 14px;color:#333;display:flex;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}#work-tzgg .work-tzgg-content .tzgg-item[data-v-fecde4f4]:last-child{border-bottom:none}#work-tzgg .work-tzgg-content .tzgg-item .left[data-v-fecde4f4]{-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}#work-tzgg .work-tzgg-content .tzgg-item .left[data-v-fecde4f4],#work-tzgg .work-tzgg-content .tzgg-item .right[data-v-fecde4f4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}#work-tzgg .work-tzgg-content .tzgg-item .right[data-v-fecde4f4]{width:calc(100% - 84px);font-size:14px;color:#333}#work-tzgg .work-tzgg-content .tzgg-item .right span[data-v-fecde4f4]{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}", ""]);
926
+ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-40042392]{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-40042392]{color:#999;font-size:13px}#work-tzgg[data-v-40042392]{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}#work-tzgg .work-tzgg-title[data-v-40042392]{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}#work-tzgg .work-tzgg-title span[data-v-40042392]{font-size:14px;font-family:PingFangSC-Semibold,PingFang SC}#work-tzgg .work-tzgg-content[data-v-40042392]{height:calc(100% - 44px);overflow:hidden}#work-tzgg .work-tzgg-content .tzgg-item[data-v-40042392]{min-height:66px;width:100%;font-family:PingFangSC-Semibold,PingFang SC;border-bottom:1px solid #f5f6f8;padding:8px 14px;color:#333;position:relative;-webkit-box-sizing:border-box;box-sizing:border-box}#work-tzgg .work-tzgg-content .tzgg-item[data-v-40042392]:last-child{border-bottom:none}#work-tzgg .work-tzgg-content .tzgg-item .title-line[data-v-40042392]{width:100%}#work-tzgg .work-tzgg-content .tzgg-item .type-tag[data-v-40042392]{display:inline-block;min-width:32px;height:20px;line-height:20px;padding:0 4px;margin-right:8px;text-align:center;color:#fff;font-size:11px;border-radius:3px;-webkit-box-sizing:border-box;box-sizing:border-box;background:#74a9ff}#work-tzgg .work-tzgg-content .tzgg-item .type-tag.type-announcement[data-v-40042392]{background:#1989fa}#work-tzgg .work-tzgg-content .tzgg-item .type-tag.type-notice[data-v-40042392]{background:#ff976a}#work-tzgg .work-tzgg-content .tzgg-item .type-tag.type-bulletin[data-v-40042392]{background:#2b6de8}#work-tzgg .work-tzgg-content .tzgg-item .subject[data-v-40042392]{-webkit-box-flex:1;-ms-flex:1;flex:1;min-width:0;font-size:14px;color:#333;line-height:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#work-tzgg .work-tzgg-content .tzgg-item .meta[data-v-40042392]{margin-top:4px;font-size:12px;color:#999;line-height:17px;text-align:left;white-space:nowrap}#work-tzgg .work-tzgg-content .tzgg-item .meta .dept[data-v-40042392]{-ms-flex-negative:0;flex-shrink:0;margin-left:10px;text-align:right;overflow:hidden;text-overflow:ellipsis}", ""]);
927
927
  // Exports
928
928
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
929
929
 
@@ -6456,7 +6456,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
6456
6456
 
6457
6457
  /***/ }),
6458
6458
 
6459
- /***/ 4858:
6459
+ /***/ 2477:
6460
6460
  /***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {
6461
6461
 
6462
6462
  //! moment.js locale configuration
@@ -16818,8 +16818,8 @@ var map = {
16818
16818
  "./fi.js": 527,
16819
16819
  "./fil": 5995,
16820
16820
  "./fil.js": 5995,
16821
- "./fo": 4858,
16822
- "./fo.js": 4858,
16821
+ "./fo": 2477,
16822
+ "./fo.js": 2477,
16823
16823
  "./fr": 5498,
16824
16824
  "./fr-ca": 6435,
16825
16825
  "./fr-ca.js": 6435,
@@ -22863,19 +22863,19 @@ var update = add("2dc7bde0", content, true, {"sourceMap":false,"shadowMode":fals
22863
22863
 
22864
22864
  /***/ }),
22865
22865
 
22866
- /***/ 3900:
22866
+ /***/ 5899:
22867
22867
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
22868
22868
 
22869
22869
  // style-loader: Adds some css to the DOM by adding a <style> tag
22870
22870
 
22871
22871
  // load the styles
22872
- var content = __webpack_require__(8214);
22872
+ var content = __webpack_require__(9817);
22873
22873
  if(content.__esModule) content = content.default;
22874
22874
  if(typeof content === 'string') content = [[module.id, content, '']];
22875
22875
  if(content.locals) module.exports = content.locals;
22876
22876
  // add the styles to the DOM
22877
22877
  var add = (__webpack_require__(9548)/* ["default"] */ .A)
22878
- var update = add("7f13f334", content, true, {"sourceMap":false,"shadowMode":false});
22878
+ var update = add("460661b2", content, true, {"sourceMap":false,"shadowMode":false});
22879
22879
 
22880
22880
  /***/ }),
22881
22881
 
@@ -22927,19 +22927,19 @@ var update = add("6c455223", content, true, {"sourceMap":false,"shadowMode":fals
22927
22927
 
22928
22928
  /***/ }),
22929
22929
 
22930
- /***/ 3755:
22930
+ /***/ 4458:
22931
22931
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
22932
22932
 
22933
22933
  // style-loader: Adds some css to the DOM by adding a <style> tag
22934
22934
 
22935
22935
  // load the styles
22936
- var content = __webpack_require__(9425);
22936
+ var content = __webpack_require__(8784);
22937
22937
  if(content.__esModule) content = content.default;
22938
22938
  if(typeof content === 'string') content = [[module.id, content, '']];
22939
22939
  if(content.locals) module.exports = content.locals;
22940
22940
  // add the styles to the DOM
22941
22941
  var add = (__webpack_require__(9548)/* ["default"] */ .A)
22942
- var update = add("b42e786e", content, true, {"sourceMap":false,"shadowMode":false});
22942
+ var update = add("3f43ab46", content, true, {"sourceMap":false,"shadowMode":false});
22943
22943
 
22944
22944
  /***/ }),
22945
22945
 
@@ -23436,7 +23436,7 @@ if (typeof window !== 'undefined') {
23436
23436
  // Indicate to webpack that this file can be concatenated
23437
23437
  /* harmony default export */ var setPublicPath = (null);
23438
23438
 
23439
- ;// 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/workTzgg.vue?vue&type=template&id=fecde4f4&scoped=true
23439
+ ;// 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/workTzgg.vue?vue&type=template&id=40042392&scoped=true
23440
23440
  var render = function render() {
23441
23441
  var _vm = this,
23442
23442
  _c = _vm._self._c;
@@ -23490,32 +23490,40 @@ var render = function render() {
23490
23490
  return _c('div', {
23491
23491
  key: item.id,
23492
23492
  staticClass: "tzgg-item",
23493
+ staticStyle: {
23494
+ "display": "flex",
23495
+ "flex-direction": "column",
23496
+ "align-items": "stretch"
23497
+ },
23493
23498
  on: {
23494
23499
  "click": function click($event) {
23495
23500
  return _vm.clickItem(item);
23496
23501
  }
23497
23502
  }
23498
23503
  }, [_c('div', {
23499
- staticClass: "left"
23500
- }, [_c('span', {
23504
+ staticClass: "title-line",
23501
23505
  staticStyle: {
23502
- "font-weight": "bold",
23503
- "color": "#333333",
23504
- "font-size": "16px"
23506
+ "display": "flex",
23507
+ "align-items": "center"
23505
23508
  }
23506
- }, [_vm._v(_vm._s(new Date(item.startTime).getDate()))]), _c('span', {
23509
+ }, [_c('span', {
23510
+ staticClass: "type-tag",
23511
+ class: 'type-' + _vm.typeClass(item.type),
23507
23512
  staticStyle: {
23508
- "color": "#999999",
23509
- "font-size": "12px"
23513
+ "flex-shrink": "0"
23510
23514
  }
23511
- }, [_vm._v(_vm._s(new Date(item.startTime).getFullYear()) + "." + _vm._s(new Date(item.startTime).getMonth() + 1))])]), _c('div', {
23512
- staticClass: "right"
23513
- }, [_c('span', {
23515
+ }, [_vm._v(_vm._s(item.type))]), _c('span', {
23516
+ staticClass: "subject"
23517
+ }, [_vm._v(_vm._s(item.flSubject))])]), _c('div', {
23518
+ staticClass: "meta",
23514
23519
  staticStyle: {
23515
- "font-size": "14px",
23516
- "color": "#333333"
23520
+ "display": "flex",
23521
+ "justify-content": "space-between",
23522
+ "align-items": "center"
23517
23523
  }
23518
- }, [_vm._v(_vm._s(item.flSubject))])])]);
23524
+ }, [_c('span', [_vm._v(_vm._s(_vm.formatTime(item.startTime)))]), item.flCreateDept ? _c('span', {
23525
+ staticClass: "dept"
23526
+ }, [_vm._v(_vm._s(item.flCreateDept))]) : _vm._e()])]);
23519
23527
  }), _vm.list.length === 0 ? _c('div', {
23520
23528
  staticClass: "no-data"
23521
23529
  }, [_c('img', {
@@ -23595,6 +23603,19 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
23595
23603
  }, _callee);
23596
23604
  }))();
23597
23605
  },
23606
+ typeClass: function typeClass(type) {
23607
+ // 公告类型标签统一使用蓝色系配色,不同类型深浅区分
23608
+ var map = {
23609
+ 通知: 'notice',
23610
+ 公告: 'announcement',
23611
+ 通报: 'bulletin'
23612
+ };
23613
+ return map[type] || 'other';
23614
+ },
23615
+ formatTime: function formatTime(time) {
23616
+ var moment = __webpack_require__(5093);
23617
+ return time ? moment(time).format('YYYY.M.DD HH:mm') : '';
23618
+ },
23598
23619
  getData: function getData() {
23599
23620
  var _this2 = this;
23600
23621
  var moment = __webpack_require__(5093);
@@ -23605,7 +23626,7 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
23605
23626
  pageSize: 10,
23606
23627
  pageNum: 1,
23607
23628
  listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
23608
- orderBy: 'topDate desc',
23629
+ orderBy: 'topDate desc,startTime desc',
23609
23630
  filter: 'all',
23610
23631
  urlsearch: 'endTime>:' + nowtime + ';startTime<:' + nowtime
23611
23632
  }).then(function (resp) {
@@ -23624,9 +23645,9 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
23624
23645
  });
23625
23646
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=script&lang=js
23626
23647
  /* harmony default export */ var components_workTzggvue_type_script_lang_js = (workTzggvue_type_script_lang_js);
23627
- // 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/workTzgg.vue?vue&type=style&index=0&id=fecde4f4&prod&scoped=true&lang=scss
23628
- var workTzggvue_type_style_index_0_id_fecde4f4_prod_scoped_true_lang_scss = __webpack_require__(3755);
23629
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=fecde4f4&prod&scoped=true&lang=scss
23648
+ // 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/workTzgg.vue?vue&type=style&index=0&id=40042392&prod&scoped=true&lang=scss
23649
+ var workTzggvue_type_style_index_0_id_40042392_prod_scoped_true_lang_scss = __webpack_require__(4458);
23650
+ ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=40042392&prod&scoped=true&lang=scss
23630
23651
 
23631
23652
  ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
23632
23653
  /* globals __VUE_SSR_CONTEXT__ */
@@ -23741,7 +23762,7 @@ var component = normalizeComponent(
23741
23762
  staticRenderFns,
23742
23763
  false,
23743
23764
  null,
23744
- "fecde4f4",
23765
+ "40042392",
23745
23766
  null
23746
23767
 
23747
23768
  )
@@ -24626,8 +24647,8 @@ var workQuick_component = normalizeComponent(
24626
24647
  )
24627
24648
 
24628
24649
  /* harmony default export */ var workQuick = (workQuick_component.exports);
24629
- ;// 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/workNotice.vue?vue&type=template&id=5a539700&scoped=true
24630
- var workNoticevue_type_template_id_5a539700_scoped_true_render = function render() {
24650
+ ;// 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/workNotice.vue?vue&type=template&id=5cb17588&scoped=true
24651
+ var workNoticevue_type_template_id_5cb17588_scoped_true_render = function render() {
24631
24652
  var _vm = this,
24632
24653
  _c = _vm._self._c;
24633
24654
  return _c('div', {
@@ -24673,7 +24694,7 @@ var workNoticevue_type_template_id_5a539700_scoped_true_render = function render
24673
24694
  }, [_vm._v(_vm._s(notice.flSubject) + "        ")]);
24674
24695
  })], 2) : _vm._e()], 1);
24675
24696
  };
24676
- var workNoticevue_type_template_id_5a539700_scoped_true_staticRenderFns = [];
24697
+ var workNoticevue_type_template_id_5cb17588_scoped_true_staticRenderFns = [];
24677
24698
 
24678
24699
  ;// 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/workNotice.vue?vue&type=script&lang=js
24679
24700
  function workNoticevue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return workNoticevue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, workNoticevue_type_script_lang_js_typeof(o); }
@@ -24696,19 +24717,34 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24696
24717
  this.getNotice();
24697
24718
  // 所有门户小组件刷新方法都注册 refreshPortletData eventBus方法,一次性刷新,需要刷新的就注册,不需要刷新就无需注册
24698
24719
  this.$bus.on('refreshPortletData', this.getNotice);
24699
- // this.showTip = Boolean(sessionStorage.getItem('openTip'))
24720
+ // 安卓 APK 中重新登录由原生侧主导,H5 可能不发生路由切换(工作页被 keep-alive 缓存),
24721
+ // created/activated 都不会重新触发;以页面回到前台作为统一的重查信号,保证新公告能被重新显示
24722
+ document.addEventListener('visibilitychange', this.handleVisibilityChange);
24700
24723
  },
24701
24724
  beforeDestroy: function beforeDestroy() {
24702
24725
  this.$bus.off('refreshPortletData', this.getNotice);
24726
+ document.removeEventListener('visibilitychange', this.handleVisibilityChange);
24727
+ if (this._retryTimer) clearTimeout(this._retryTimer);
24728
+ },
24729
+ activated: function activated() {
24730
+ // keep-alive 重新激活(如退出登录后重新登录回到工作页)时重新查询;跳过首次挂载与 created 的重复请求
24731
+ if (Date.now() - (this._fetchedAt || 0) > 1500) {
24732
+ this.getNotice();
24733
+ }
24703
24734
  },
24704
24735
  mounted: function mounted() {
24705
24736
  document.getElementById('van-no').parentNode.parentNode.style.marginBottom = '0';
24706
24737
  },
24707
24738
  methods: {
24708
- getNotice: function getNotice() {
24739
+ handleVisibilityChange: function handleVisibilityChange() {
24740
+ if (document.visibilityState === 'visible') {
24741
+ this.getNotice();
24742
+ }
24743
+ },
24744
+ getNotice: function getNotice(retryCount) {
24709
24745
  var _this = this;
24710
24746
  return workNoticevue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/workNoticevue_type_script_lang_js_regeneratorRuntime().mark(function _callee() {
24711
- var now, res;
24747
+ var now, res, closedIds, hasNewNotice;
24712
24748
  return workNoticevue_type_script_lang_js_regeneratorRuntime().wrap(function _callee$(_context) {
24713
24749
  while (1) switch (_context.prev = _context.next) {
24714
24750
  case 0:
@@ -24718,21 +24754,65 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24718
24754
  pageSize: 3,
24719
24755
  pageNum: 1,
24720
24756
  listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
24721
- // 新版接口优先处理 filter: 'publish',urlsearch 保留用于兼容旧版本接口
24722
- filter: 'publish',
24757
+ orderBy: 'topDate desc,startTime desc',
24758
+ filter: 'notRead',
24723
24759
  urlsearch: 'endTime>:' + now + ';startTime<:' + now
24724
24760
  });
24725
24761
  case 3:
24726
24762
  res = _context.sent;
24727
- if (res.code === 'success') {
24728
- _this.noticeData = res.body.pageInfo.list;
24729
- if (!_this.noticeData.length) {
24730
- _this.handleCloseNotice();
24731
- }
24763
+ if (!(res.code !== 'success')) {
24764
+ _context.next = 7;
24765
+ break;
24766
+ }
24767
+ // 登录态切换瞬间请求可能短暂失败,延迟重试,避免公告条因一次失败永久不显示
24768
+ if ((retryCount || 0) < 2) {
24769
+ _this._retryTimer = setTimeout(function () {
24770
+ _this.getNotice((retryCount || 0) + 1);
24771
+ }, 2000);
24732
24772
  } else {
24733
24773
  _this.$toast.fail(res.message);
24734
24774
  }
24735
- case 5:
24775
+ return _context.abrupt("return");
24776
+ case 7:
24777
+ _this._fetchedAt = Date.now();
24778
+ _this.noticeData = res.body.pageInfo.list || [];
24779
+ // 关闭记忆:关闭时记录当时显示的全部公告 id(逗号分隔);
24780
+ // 当前列表存在任一未记录过的 id(即有新公告)就重新显示,与列表排序无关(接口不保证最新一条在首位)
24781
+ closedIds = (localStorage.getItem('closedNoticeId') || '').split(',').filter(Boolean);
24782
+ hasNewNotice = _this.noticeData.some(function (item) {
24783
+ return !closedIds.includes(String(item.id));
24784
+ });
24785
+ _this.$nextTick(function () {
24786
+ if (_this.$el) {
24787
+ // 真机排查辅助:将判断依据写入 DOM 属性,便于通过页面结构直接确认(确认后可移除)
24788
+ _this.$el.setAttribute('data-notice-debug', JSON.stringify({
24789
+ count: _this.noticeData.length,
24790
+ ids: _this.noticeData.map(function (item) {
24791
+ return String(item.id);
24792
+ }),
24793
+ closedIds: closedIds,
24794
+ hasNewNotice: hasNewNotice
24795
+ }));
24796
+ }
24797
+ });
24798
+ if (!_this.noticeData.length || !hasNewNotice) {
24799
+ _this.showTip = false;
24800
+ // 同步隐藏占位元素
24801
+ _this.$nextTick(function () {
24802
+ if (_this.$el.parentElement) {
24803
+ _this.$el.parentElement.style.display = 'none';
24804
+ }
24805
+ });
24806
+ } else {
24807
+ _this.showTip = true;
24808
+ // 恢复占位元素显示(应对 refreshPortletData 刷新后由隐藏转显示)
24809
+ _this.$nextTick(function () {
24810
+ if (_this.$el.parentElement) {
24811
+ _this.$el.parentElement.style.display = '';
24812
+ }
24813
+ });
24814
+ }
24815
+ case 13:
24736
24816
  case "end":
24737
24817
  return _context.stop();
24738
24818
  }
@@ -24741,12 +24821,17 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24741
24821
  },
24742
24822
  handleCloseNotice: function handleCloseNotice() {
24743
24823
  var _this2 = this;
24824
+ // 记录关闭时正在显示的全部公告 id(逗号分隔),下次查询到列表无新增 id 则不再显示(与查询侧一致转字符串存储)
24825
+ if (this.noticeData && this.noticeData.length) {
24826
+ localStorage.setItem('closedNoticeId', this.noticeData.map(function (item) {
24827
+ return String(item.id);
24828
+ }).join(','));
24829
+ }
24744
24830
  this.showTip = false;
24745
24831
  // 同步隐藏占位元素
24746
24832
  this.$nextTick(function () {
24747
24833
  _this2.$el.parentElement.style.display = 'none';
24748
24834
  });
24749
- sessionStorage.setItem('openTip', '0');
24750
24835
  },
24751
24836
  noticeBarClick: function noticeBarClick(item) {
24752
24837
  // this.$router.push( '/viewcontent?wfEngineUrl=ecoa/dzgg&busiDataId=' +item.id +'&viewContent=1')
@@ -24761,9 +24846,9 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24761
24846
  });
24762
24847
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=script&lang=js
24763
24848
  /* harmony default export */ var components_workNoticevue_type_script_lang_js = (workNoticevue_type_script_lang_js);
24764
- // 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/workNotice.vue?vue&type=style&index=0&id=5a539700&prod&scoped=true&lang=scss
24765
- var workNoticevue_type_style_index_0_id_5a539700_prod_scoped_true_lang_scss = __webpack_require__(3900);
24766
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=5a539700&prod&scoped=true&lang=scss
24849
+ // 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/workNotice.vue?vue&type=style&index=0&id=5cb17588&prod&scoped=true&lang=scss
24850
+ var workNoticevue_type_style_index_0_id_5cb17588_prod_scoped_true_lang_scss = __webpack_require__(5899);
24851
+ ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=5cb17588&prod&scoped=true&lang=scss
24767
24852
 
24768
24853
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue
24769
24854
 
@@ -24776,11 +24861,11 @@ var workNoticevue_type_style_index_0_id_5a539700_prod_scoped_true_lang_scss = __
24776
24861
 
24777
24862
  var workNotice_component = normalizeComponent(
24778
24863
  components_workNoticevue_type_script_lang_js,
24779
- workNoticevue_type_template_id_5a539700_scoped_true_render,
24780
- workNoticevue_type_template_id_5a539700_scoped_true_staticRenderFns,
24864
+ workNoticevue_type_template_id_5cb17588_scoped_true_render,
24865
+ workNoticevue_type_template_id_5cb17588_scoped_true_staticRenderFns,
24781
24866
  false,
24782
24867
  null,
24783
- "5a539700",
24868
+ "5cb17588",
24784
24869
  null
24785
24870
 
24786
24871
  )