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.
@@ -826,7 +826,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-cf6d8e06]{display:-web
826
826
 
827
827
  /***/ }),
828
828
 
829
- /***/ 3656:
829
+ /***/ 9207:
830
830
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
831
831
 
832
832
  "use strict";
@@ -840,7 +840,7 @@ __webpack_require__.r(__webpack_exports__);
840
840
 
841
841
  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()));
842
842
  // Module
843
- ___CSS_LOADER_EXPORT___.push([module.id, "#van-no[data-v-5a539700]{min-height:40px}", ""]);
843
+ ___CSS_LOADER_EXPORT___.push([module.id, "#van-no[data-v-5cb17588]{min-height:40px}", ""]);
844
844
  // Exports
845
845
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
846
846
 
@@ -919,7 +919,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-fc36d506]{display:-web
919
919
 
920
920
  /***/ }),
921
921
 
922
- /***/ 3087:
922
+ /***/ 2038:
923
923
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
924
924
 
925
925
  "use strict";
@@ -933,7 +933,7 @@ __webpack_require__.r(__webpack_exports__);
933
933
 
934
934
  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()));
935
935
  // Module
936
- ___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}", ""]);
936
+ ___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}", ""]);
937
937
  // Exports
938
938
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
939
939
 
@@ -22873,19 +22873,19 @@ var update = add("f5a9f960", content, true, {"sourceMap":false,"shadowMode":fals
22873
22873
 
22874
22874
  /***/ }),
22875
22875
 
22876
- /***/ 1211:
22876
+ /***/ 9816:
22877
22877
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
22878
22878
 
22879
22879
  // style-loader: Adds some css to the DOM by adding a <style> tag
22880
22880
 
22881
22881
  // load the styles
22882
- var content = __webpack_require__(3656);
22882
+ var content = __webpack_require__(9207);
22883
22883
  if(content.__esModule) content = content.default;
22884
22884
  if(typeof content === 'string') content = [[module.id, content, '']];
22885
22885
  if(content.locals) module.exports = content.locals;
22886
22886
  // add the styles to the DOM
22887
22887
  var add = (__webpack_require__(9548)/* ["default"] */ .A)
22888
- var update = add("4f309518", content, true, {"sourceMap":false,"shadowMode":false});
22888
+ var update = add("36509167", content, true, {"sourceMap":false,"shadowMode":false});
22889
22889
 
22890
22890
  /***/ }),
22891
22891
 
@@ -22937,19 +22937,19 @@ var update = add("08543463", content, true, {"sourceMap":false,"shadowMode":fals
22937
22937
 
22938
22938
  /***/ }),
22939
22939
 
22940
- /***/ 1576:
22940
+ /***/ 5737:
22941
22941
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
22942
22942
 
22943
22943
  // style-loader: Adds some css to the DOM by adding a <style> tag
22944
22944
 
22945
22945
  // load the styles
22946
- var content = __webpack_require__(3087);
22946
+ var content = __webpack_require__(2038);
22947
22947
  if(content.__esModule) content = content.default;
22948
22948
  if(typeof content === 'string') content = [[module.id, content, '']];
22949
22949
  if(content.locals) module.exports = content.locals;
22950
22950
  // add the styles to the DOM
22951
22951
  var add = (__webpack_require__(9548)/* ["default"] */ .A)
22952
- var update = add("41f7a609", content, true, {"sourceMap":false,"shadowMode":false});
22952
+ var update = add("495ae4f4", content, true, {"sourceMap":false,"shadowMode":false});
22953
22953
 
22954
22954
  /***/ }),
22955
22955
 
@@ -23446,7 +23446,7 @@ if (typeof window !== 'undefined') {
23446
23446
  // Indicate to webpack that this file can be concatenated
23447
23447
  /* harmony default export */ var setPublicPath = (null);
23448
23448
 
23449
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-83.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
23449
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-83.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
23450
23450
  var render = function render() {
23451
23451
  var _vm = this,
23452
23452
  _c = _vm._self._c;
@@ -23500,32 +23500,40 @@ var render = function render() {
23500
23500
  return _c('div', {
23501
23501
  key: item.id,
23502
23502
  staticClass: "tzgg-item",
23503
+ staticStyle: {
23504
+ "display": "flex",
23505
+ "flex-direction": "column",
23506
+ "align-items": "stretch"
23507
+ },
23503
23508
  on: {
23504
23509
  "click": function click($event) {
23505
23510
  return _vm.clickItem(item);
23506
23511
  }
23507
23512
  }
23508
23513
  }, [_c('div', {
23509
- staticClass: "left"
23510
- }, [_c('span', {
23514
+ staticClass: "title-line",
23511
23515
  staticStyle: {
23512
- "font-weight": "bold",
23513
- "color": "#333333",
23514
- "font-size": "16px"
23516
+ "display": "flex",
23517
+ "align-items": "center"
23515
23518
  }
23516
- }, [_vm._v(_vm._s(new Date(item.startTime).getDate()))]), _c('span', {
23519
+ }, [_c('span', {
23520
+ staticClass: "type-tag",
23521
+ class: 'type-' + _vm.typeClass(item.type),
23517
23522
  staticStyle: {
23518
- "color": "#999999",
23519
- "font-size": "12px"
23523
+ "flex-shrink": "0"
23520
23524
  }
23521
- }, [_vm._v(_vm._s(new Date(item.startTime).getFullYear()) + "." + _vm._s(new Date(item.startTime).getMonth() + 1))])]), _c('div', {
23522
- staticClass: "right"
23523
- }, [_c('span', {
23525
+ }, [_vm._v(_vm._s(item.type))]), _c('span', {
23526
+ staticClass: "subject"
23527
+ }, [_vm._v(_vm._s(item.flSubject))])]), _c('div', {
23528
+ staticClass: "meta",
23524
23529
  staticStyle: {
23525
- "font-size": "14px",
23526
- "color": "#333333"
23530
+ "display": "flex",
23531
+ "justify-content": "space-between",
23532
+ "align-items": "center"
23527
23533
  }
23528
- }, [_vm._v(_vm._s(item.flSubject))])])]);
23534
+ }, [_c('span', [_vm._v(_vm._s(_vm.formatTime(item.startTime)))]), item.flCreateDept ? _c('span', {
23535
+ staticClass: "dept"
23536
+ }, [_vm._v(_vm._s(item.flCreateDept))]) : _vm._e()])]);
23529
23537
  }), _vm.list.length === 0 ? _c('div', {
23530
23538
  staticClass: "no-data"
23531
23539
  }, [_c('img', {
@@ -23605,6 +23613,19 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
23605
23613
  }, _callee);
23606
23614
  }))();
23607
23615
  },
23616
+ typeClass: function typeClass(type) {
23617
+ // 公告类型标签统一使用蓝色系配色,不同类型深浅区分
23618
+ var map = {
23619
+ 通知: 'notice',
23620
+ 公告: 'announcement',
23621
+ 通报: 'bulletin'
23622
+ };
23623
+ return map[type] || 'other';
23624
+ },
23625
+ formatTime: function formatTime(time) {
23626
+ var moment = __webpack_require__(5093);
23627
+ return time ? moment(time).format('YYYY.M.DD HH:mm') : '';
23628
+ },
23608
23629
  getData: function getData() {
23609
23630
  var _this2 = this;
23610
23631
  var moment = __webpack_require__(5093);
@@ -23615,7 +23636,7 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
23615
23636
  pageSize: 10,
23616
23637
  pageNum: 1,
23617
23638
  listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
23618
- orderBy: 'topDate desc',
23639
+ orderBy: 'topDate desc,startTime desc',
23619
23640
  filter: 'all',
23620
23641
  urlsearch: 'endTime>:' + nowtime + ';startTime<:' + nowtime
23621
23642
  }).then(function (resp) {
@@ -23634,9 +23655,9 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
23634
23655
  });
23635
23656
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=script&lang=js
23636
23657
  /* harmony default export */ var components_workTzggvue_type_script_lang_js = (workTzggvue_type_script_lang_js);
23637
- // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-65.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65.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
23638
- var workTzggvue_type_style_index_0_id_fecde4f4_prod_scoped_true_lang_scss = __webpack_require__(1576);
23639
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=fecde4f4&prod&scoped=true&lang=scss
23658
+ // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-65.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65.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
23659
+ var workTzggvue_type_style_index_0_id_40042392_prod_scoped_true_lang_scss = __webpack_require__(5737);
23660
+ ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=40042392&prod&scoped=true&lang=scss
23640
23661
 
23641
23662
  ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
23642
23663
  /* globals __VUE_SSR_CONTEXT__ */
@@ -23751,7 +23772,7 @@ var component = normalizeComponent(
23751
23772
  staticRenderFns,
23752
23773
  false,
23753
23774
  null,
23754
- "fecde4f4",
23775
+ "40042392",
23755
23776
  null
23756
23777
 
23757
23778
  )
@@ -24636,8 +24657,8 @@ var workQuick_component = normalizeComponent(
24636
24657
  )
24637
24658
 
24638
24659
  /* harmony default export */ var workQuick = (workQuick_component.exports);
24639
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-83.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
24640
- var workNoticevue_type_template_id_5a539700_scoped_true_render = function render() {
24660
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-83.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
24661
+ var workNoticevue_type_template_id_5cb17588_scoped_true_render = function render() {
24641
24662
  var _vm = this,
24642
24663
  _c = _vm._self._c;
24643
24664
  return _c('div', {
@@ -24683,7 +24704,7 @@ var workNoticevue_type_template_id_5a539700_scoped_true_render = function render
24683
24704
  }, [_vm._v(_vm._s(notice.flSubject) + "        ")]);
24684
24705
  })], 2) : _vm._e()], 1);
24685
24706
  };
24686
- var workNoticevue_type_template_id_5a539700_scoped_true_staticRenderFns = [];
24707
+ var workNoticevue_type_template_id_5cb17588_scoped_true_staticRenderFns = [];
24687
24708
 
24688
24709
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-83.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
24689
24710
  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); }
@@ -24706,19 +24727,34 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24706
24727
  this.getNotice();
24707
24728
  // 所有门户小组件刷新方法都注册 refreshPortletData eventBus方法,一次性刷新,需要刷新的就注册,不需要刷新就无需注册
24708
24729
  this.$bus.on('refreshPortletData', this.getNotice);
24709
- // this.showTip = Boolean(sessionStorage.getItem('openTip'))
24730
+ // 安卓 APK 中重新登录由原生侧主导,H5 可能不发生路由切换(工作页被 keep-alive 缓存),
24731
+ // created/activated 都不会重新触发;以页面回到前台作为统一的重查信号,保证新公告能被重新显示
24732
+ document.addEventListener('visibilitychange', this.handleVisibilityChange);
24710
24733
  },
24711
24734
  beforeDestroy: function beforeDestroy() {
24712
24735
  this.$bus.off('refreshPortletData', this.getNotice);
24736
+ document.removeEventListener('visibilitychange', this.handleVisibilityChange);
24737
+ if (this._retryTimer) clearTimeout(this._retryTimer);
24738
+ },
24739
+ activated: function activated() {
24740
+ // keep-alive 重新激活(如退出登录后重新登录回到工作页)时重新查询;跳过首次挂载与 created 的重复请求
24741
+ if (Date.now() - (this._fetchedAt || 0) > 1500) {
24742
+ this.getNotice();
24743
+ }
24713
24744
  },
24714
24745
  mounted: function mounted() {
24715
24746
  document.getElementById('van-no').parentNode.parentNode.style.marginBottom = '0';
24716
24747
  },
24717
24748
  methods: {
24718
- getNotice: function getNotice() {
24749
+ handleVisibilityChange: function handleVisibilityChange() {
24750
+ if (document.visibilityState === 'visible') {
24751
+ this.getNotice();
24752
+ }
24753
+ },
24754
+ getNotice: function getNotice(retryCount) {
24719
24755
  var _this = this;
24720
24756
  return workNoticevue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/workNoticevue_type_script_lang_js_regeneratorRuntime().mark(function _callee() {
24721
- var now, res;
24757
+ var now, res, closedIds, hasNewNotice;
24722
24758
  return workNoticevue_type_script_lang_js_regeneratorRuntime().wrap(function _callee$(_context) {
24723
24759
  while (1) switch (_context.prev = _context.next) {
24724
24760
  case 0:
@@ -24728,21 +24764,65 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24728
24764
  pageSize: 3,
24729
24765
  pageNum: 1,
24730
24766
  listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
24731
- // 新版接口优先处理 filter: 'publish',urlsearch 保留用于兼容旧版本接口
24732
- filter: 'publish',
24767
+ orderBy: 'topDate desc,startTime desc',
24768
+ filter: 'notRead',
24733
24769
  urlsearch: 'endTime>:' + now + ';startTime<:' + now
24734
24770
  });
24735
24771
  case 3:
24736
24772
  res = _context.sent;
24737
- if (res.code === 'success') {
24738
- _this.noticeData = res.body.pageInfo.list;
24739
- if (!_this.noticeData.length) {
24740
- _this.handleCloseNotice();
24741
- }
24773
+ if (!(res.code !== 'success')) {
24774
+ _context.next = 7;
24775
+ break;
24776
+ }
24777
+ // 登录态切换瞬间请求可能短暂失败,延迟重试,避免公告条因一次失败永久不显示
24778
+ if ((retryCount || 0) < 2) {
24779
+ _this._retryTimer = setTimeout(function () {
24780
+ _this.getNotice((retryCount || 0) + 1);
24781
+ }, 2000);
24742
24782
  } else {
24743
24783
  _this.$toast.fail(res.message);
24744
24784
  }
24745
- case 5:
24785
+ return _context.abrupt("return");
24786
+ case 7:
24787
+ _this._fetchedAt = Date.now();
24788
+ _this.noticeData = res.body.pageInfo.list || [];
24789
+ // 关闭记忆:关闭时记录当时显示的全部公告 id(逗号分隔);
24790
+ // 当前列表存在任一未记录过的 id(即有新公告)就重新显示,与列表排序无关(接口不保证最新一条在首位)
24791
+ closedIds = (localStorage.getItem('closedNoticeId') || '').split(',').filter(Boolean);
24792
+ hasNewNotice = _this.noticeData.some(function (item) {
24793
+ return !closedIds.includes(String(item.id));
24794
+ });
24795
+ _this.$nextTick(function () {
24796
+ if (_this.$el) {
24797
+ // 真机排查辅助:将判断依据写入 DOM 属性,便于通过页面结构直接确认(确认后可移除)
24798
+ _this.$el.setAttribute('data-notice-debug', JSON.stringify({
24799
+ count: _this.noticeData.length,
24800
+ ids: _this.noticeData.map(function (item) {
24801
+ return String(item.id);
24802
+ }),
24803
+ closedIds: closedIds,
24804
+ hasNewNotice: hasNewNotice
24805
+ }));
24806
+ }
24807
+ });
24808
+ if (!_this.noticeData.length || !hasNewNotice) {
24809
+ _this.showTip = false;
24810
+ // 同步隐藏占位元素
24811
+ _this.$nextTick(function () {
24812
+ if (_this.$el.parentElement) {
24813
+ _this.$el.parentElement.style.display = 'none';
24814
+ }
24815
+ });
24816
+ } else {
24817
+ _this.showTip = true;
24818
+ // 恢复占位元素显示(应对 refreshPortletData 刷新后由隐藏转显示)
24819
+ _this.$nextTick(function () {
24820
+ if (_this.$el.parentElement) {
24821
+ _this.$el.parentElement.style.display = '';
24822
+ }
24823
+ });
24824
+ }
24825
+ case 13:
24746
24826
  case "end":
24747
24827
  return _context.stop();
24748
24828
  }
@@ -24751,12 +24831,17 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24751
24831
  },
24752
24832
  handleCloseNotice: function handleCloseNotice() {
24753
24833
  var _this2 = this;
24834
+ // 记录关闭时正在显示的全部公告 id(逗号分隔),下次查询到列表无新增 id 则不再显示(与查询侧一致转字符串存储)
24835
+ if (this.noticeData && this.noticeData.length) {
24836
+ localStorage.setItem('closedNoticeId', this.noticeData.map(function (item) {
24837
+ return String(item.id);
24838
+ }).join(','));
24839
+ }
24754
24840
  this.showTip = false;
24755
24841
  // 同步隐藏占位元素
24756
24842
  this.$nextTick(function () {
24757
24843
  _this2.$el.parentElement.style.display = 'none';
24758
24844
  });
24759
- sessionStorage.setItem('openTip', '0');
24760
24845
  },
24761
24846
  noticeBarClick: function noticeBarClick(item) {
24762
24847
  // this.$router.push( '/viewcontent?wfEngineUrl=ecoa/dzgg&busiDataId=' +item.id +'&viewContent=1')
@@ -24771,9 +24856,9 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24771
24856
  });
24772
24857
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=script&lang=js
24773
24858
  /* harmony default export */ var components_workNoticevue_type_script_lang_js = (workNoticevue_type_script_lang_js);
24774
- // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-65.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65.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
24775
- var workNoticevue_type_style_index_0_id_5a539700_prod_scoped_true_lang_scss = __webpack_require__(1211);
24776
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=5a539700&prod&scoped=true&lang=scss
24859
+ // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-65.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65.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
24860
+ var workNoticevue_type_style_index_0_id_5cb17588_prod_scoped_true_lang_scss = __webpack_require__(9816);
24861
+ ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=5cb17588&prod&scoped=true&lang=scss
24777
24862
 
24778
24863
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue
24779
24864
 
@@ -24786,11 +24871,11 @@ var workNoticevue_type_style_index_0_id_5a539700_prod_scoped_true_lang_scss = __
24786
24871
 
24787
24872
  var workNotice_component = normalizeComponent(
24788
24873
  components_workNoticevue_type_script_lang_js,
24789
- workNoticevue_type_template_id_5a539700_scoped_true_render,
24790
- workNoticevue_type_template_id_5a539700_scoped_true_staticRenderFns,
24874
+ workNoticevue_type_template_id_5cb17588_scoped_true_render,
24875
+ workNoticevue_type_template_id_5cb17588_scoped_true_staticRenderFns,
24791
24876
  false,
24792
24877
  null,
24793
- "5a539700",
24878
+ "5cb17588",
24794
24879
  null
24795
24880
 
24796
24881
  )