ecinc-cloud-moadesktop 9.7.11 → 9.7.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/ecmoadesktop.common.js +42 -32
  2. package/lib/ecmoadesktop.umd.js +39 -29
  3. package/lib/ecmoadesktop.umd.min.js +1 -1
  4. package/package.json +1 -1
package/lib/ecmoadesktop.common.js CHANGED
@@ -816,7 +816,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-cf6d8e06]{display:-web
816
816
 
817
817
  /***/ }),
818
818
 
819
- /***/ 1583:
819
+ /***/ 8214:
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-6a724913]{min-height:40px}", ""]);
833
+ ___CSS_LOADER_EXPORT___.push([module.id, "#van-no[data-v-5a539700]{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
- /***/ 1937:
912
+ /***/ 9425:
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-59abe380]{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-59abe380]{color:#999;font-size:13px}#work-tzgg[data-v-59abe380]{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-59abe380]{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-59abe380]{font-size:14px;font-family:PingFangSC-Semibold,PingFang SC}#work-tzgg .work-tzgg-content[data-v-59abe380]{height:calc(100% - 44px);overflow:hidden}#work-tzgg .work-tzgg-content .tzgg-item[data-v-59abe380]{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-59abe380]:last-child{border-bottom:none}#work-tzgg .work-tzgg-content .tzgg-item .left[data-v-59abe380]{-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-59abe380],#work-tzgg .work-tzgg-content .tzgg-item .right[data-v-59abe380]{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-59abe380]{width:calc(100% - 84px);font-size:14px;color:#333}#work-tzgg .work-tzgg-content .tzgg-item .right span[data-v-59abe380]{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-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}", ""]);
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
- /***/ 2477:
6459
+ /***/ 4858:
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": 2477,
16822
- "./fo.js": 2477,
16821
+ "./fo": 4858,
16822
+ "./fo.js": 4858,
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
- /***/ 4141:
22866
+ /***/ 3900:
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__(1583);
22872
+ var content = __webpack_require__(8214);
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("217b6c4e", content, true, {"sourceMap":false,"shadowMode":false});
22878
+ var update = add("7f13f334", 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
- /***/ 5895:
22930
+ /***/ 3755:
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__(1937);
22936
+ var content = __webpack_require__(9425);
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("a5d85d52", content, true, {"sourceMap":false,"shadowMode":false});
22942
+ var update = add("b42e786e", 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=59abe380&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=fecde4f4&scoped=true
23440
23440
  var render = function render() {
23441
23441
  var _vm = this,
23442
23442
  _c = _vm._self._c;
@@ -23599,16 +23599,24 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
23599
23599
  var _this2 = this;
23600
23600
  var moment = __webpack_require__(5093);
23601
23601
  var nowtime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss');
23602
+ // filter: 'all' 查询已读+未读的全部公告，新版接口优先处理 filter，
23603
+ // urlsearch 保留用于兼容旧版本接口，展示发布时间有效范围内的所有公告（包含未读、已读）
23602
23604
  this.$app.listdata('ecoa/dzgg/listdata', {
23603
- pageSize: 3,
23605
+ pageSize: 10,
23604
23606
  pageNum: 1,
23605
23607
  listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
23608
+ orderBy: 'topDate desc',
23609
+ filter: 'all',
23606
23610
  urlsearch: 'endTime>:' + nowtime + ';startTime<:' + nowtime
23607
23611
  }).then(function (resp) {
23608
- if (resp.code === 'success') {
23609
- _this2.list = resp.body.pageInfo.list;
23610
- } else {
23611
- _this2.$toast.fail(resp.message);
23612
+ if (resp.code === 'success' && resp.body && resp.body.pageInfo && resp.body.pageInfo.list) {
23613
+ var today = moment();
23614
+ _this2.list = resp.body.pageInfo.list.filter(function (item) {
23615
+ // 只保留发布时间有效范围内的公告（按天比较，兼容日期/日期时间格式）
23616
+ if (item.startTime && today.isBefore(moment(item.startTime), 'day')) return false;
23617
+ if (item.endTime && today.isAfter(moment(item.endTime), 'day')) return false;
23618
+ return true;
23619
+ }).slice(0, 3);
23612
23620
  }
23613
23621
  });
23614
23622
  }
@@ -23616,9 +23624,9 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
23616
23624
  });
23617
23625
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=script&lang=js
23618
23626
  /* harmony default export */ var components_workTzggvue_type_script_lang_js = (workTzggvue_type_script_lang_js);
23619
- // 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=59abe380&prod&scoped=true&lang=scss
23620
- var workTzggvue_type_style_index_0_id_59abe380_prod_scoped_true_lang_scss = __webpack_require__(5895);
23621
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=59abe380&prod&scoped=true&lang=scss
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
23622
23630
 
23623
23631
  ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
23624
23632
  /* globals __VUE_SSR_CONTEXT__ */
@@ -23733,7 +23741,7 @@ var component = normalizeComponent(
23733
23741
  staticRenderFns,
23734
23742
  false,
23735
23743
  null,
23736
- "59abe380",
23744
+ "fecde4f4",
23737
23745
  null
23738
23746
 
23739
23747
  )
@@ -24618,8 +24626,8 @@ var workQuick_component = normalizeComponent(
24618
24626
  )
24619
24627
 
24620
24628
  /* harmony default export */ var workQuick = (workQuick_component.exports);
24621
- ;// 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=6a724913&scoped=true
24622
- var workNoticevue_type_template_id_6a724913_scoped_true_render = function render() {
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() {
24623
24631
  var _vm = this,
24624
24632
  _c = _vm._self._c;
24625
24633
  return _c('div', {
@@ -24665,7 +24673,7 @@ var workNoticevue_type_template_id_6a724913_scoped_true_render = function render
24665
24673
  }, [_vm._v(_vm._s(notice.flSubject) + "        ")]);
24666
24674
  })], 2) : _vm._e()], 1);
24667
24675
  };
24668
- var workNoticevue_type_template_id_6a724913_scoped_true_staticRenderFns = [];
24676
+ var workNoticevue_type_template_id_5a539700_scoped_true_staticRenderFns = [];
24669
24677
 
24670
24678
  ;// 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
24671
24679
  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); }
@@ -24710,6 +24718,8 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24710
24718
  pageSize: 3,
24711
24719
  pageNum: 1,
24712
24720
  listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
24721
+ // 新版接口优先处理 filter: 'publish'，urlsearch 保留用于兼容旧版本接口
24722
+ filter: 'publish',
24713
24723
  urlsearch: 'endTime>:' + now + ';startTime<:' + now
24714
24724
  });
24715
24725
  case 3:
@@ -24751,9 +24761,9 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24751
24761
  });
24752
24762
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=script&lang=js
24753
24763
  /* harmony default export */ var components_workNoticevue_type_script_lang_js = (workNoticevue_type_script_lang_js);
24754
- // 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=6a724913&prod&scoped=true&lang=scss
24755
- var workNoticevue_type_style_index_0_id_6a724913_prod_scoped_true_lang_scss = __webpack_require__(4141);
24756
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=6a724913&prod&scoped=true&lang=scss
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
24757
24767
 
24758
24768
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue
24759
24769
 
@@ -24766,11 +24776,11 @@ var workNoticevue_type_style_index_0_id_6a724913_prod_scoped_true_lang_scss = __
24766
24776
 
24767
24777
  var workNotice_component = normalizeComponent(
24768
24778
  components_workNoticevue_type_script_lang_js,
24769
- workNoticevue_type_template_id_6a724913_scoped_true_render,
24770
- workNoticevue_type_template_id_6a724913_scoped_true_staticRenderFns,
24779
+ workNoticevue_type_template_id_5a539700_scoped_true_render,
24780
+ workNoticevue_type_template_id_5a539700_scoped_true_staticRenderFns,
24771
24781
  false,
24772
24782
  null,
24773
- "6a724913",
24783
+ "5a539700",
24774
24784
  null
24775
24785
 
24776
24786
  )
package/lib/ecmoadesktop.umd.js CHANGED
@@ -826,7 +826,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-cf6d8e06]{display:-web
826
826
 
827
827
  /***/ }),
828
828
 
829
- /***/ 4121:
829
+ /***/ 3656:
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-6a724913]{min-height:40px}", ""]);
843
+ ___CSS_LOADER_EXPORT___.push([module.id, "#van-no[data-v-5a539700]{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
- /***/ 2179:
922
+ /***/ 3087:
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-59abe380]{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-59abe380]{color:#999;font-size:13px}#work-tzgg[data-v-59abe380]{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-59abe380]{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-59abe380]{font-size:14px;font-family:PingFangSC-Semibold,PingFang SC}#work-tzgg .work-tzgg-content[data-v-59abe380]{height:calc(100% - 44px);overflow:hidden}#work-tzgg .work-tzgg-content .tzgg-item[data-v-59abe380]{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-59abe380]:last-child{border-bottom:none}#work-tzgg .work-tzgg-content .tzgg-item .left[data-v-59abe380]{-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-59abe380],#work-tzgg .work-tzgg-content .tzgg-item .right[data-v-59abe380]{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-59abe380]{width:calc(100% - 84px);font-size:14px;color:#333}#work-tzgg .work-tzgg-content .tzgg-item .right span[data-v-59abe380]{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-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}", ""]);
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
- /***/ 2634:
22876
+ /***/ 1211:
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__(4121);
22882
+ var content = __webpack_require__(3656);
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("48960c19", content, true, {"sourceMap":false,"shadowMode":false});
22888
+ var update = add("4f309518", 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
- /***/ 9492:
22940
+ /***/ 1576:
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__(2179);
22946
+ var content = __webpack_require__(3087);
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("4922b397", content, true, {"sourceMap":false,"shadowMode":false});
22952
+ var update = add("41f7a609", 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=59abe380&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=fecde4f4&scoped=true
23450
23450
  var render = function render() {
23451
23451
  var _vm = this,
23452
23452
  _c = _vm._self._c;
@@ -23609,16 +23609,24 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
23609
23609
  var _this2 = this;
23610
23610
  var moment = __webpack_require__(5093);
23611
23611
  var nowtime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss');
23612
+ // filter: 'all' 查询已读+未读的全部公告，新版接口优先处理 filter，
23613
+ // urlsearch 保留用于兼容旧版本接口，展示发布时间有效范围内的所有公告（包含未读、已读）
23612
23614
  this.$app.listdata('ecoa/dzgg/listdata', {
23613
- pageSize: 3,
23615
+ pageSize: 10,
23614
23616
  pageNum: 1,
23615
23617
  listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
23618
+ orderBy: 'topDate desc',
23619
+ filter: 'all',
23616
23620
  urlsearch: 'endTime>:' + nowtime + ';startTime<:' + nowtime
23617
23621
  }).then(function (resp) {
23618
- if (resp.code === 'success') {
23619
- _this2.list = resp.body.pageInfo.list;
23620
- } else {
23621
- _this2.$toast.fail(resp.message);
23622
+ if (resp.code === 'success' && resp.body && resp.body.pageInfo && resp.body.pageInfo.list) {
23623
+ var today = moment();
23624
+ _this2.list = resp.body.pageInfo.list.filter(function (item) {
23625
+ // 只保留发布时间有效范围内的公告（按天比较，兼容日期/日期时间格式）
23626
+ if (item.startTime && today.isBefore(moment(item.startTime), 'day')) return false;
23627
+ if (item.endTime && today.isAfter(moment(item.endTime), 'day')) return false;
23628
+ return true;
23629
+ }).slice(0, 3);
23622
23630
  }
23623
23631
  });
23624
23632
  }
@@ -23626,9 +23634,9 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
23626
23634
  });
23627
23635
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=script&lang=js
23628
23636
  /* harmony default export */ var components_workTzggvue_type_script_lang_js = (workTzggvue_type_script_lang_js);
23629
- // 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=59abe380&prod&scoped=true&lang=scss
23630
- var workTzggvue_type_style_index_0_id_59abe380_prod_scoped_true_lang_scss = __webpack_require__(9492);
23631
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=59abe380&prod&scoped=true&lang=scss
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
23632
23640
 
23633
23641
  ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
23634
23642
  /* globals __VUE_SSR_CONTEXT__ */
@@ -23743,7 +23751,7 @@ var component = normalizeComponent(
23743
23751
  staticRenderFns,
23744
23752
  false,
23745
23753
  null,
23746
- "59abe380",
23754
+ "fecde4f4",
23747
23755
  null
23748
23756
 
23749
23757
  )
@@ -24628,8 +24636,8 @@ var workQuick_component = normalizeComponent(
24628
24636
  )
24629
24637
 
24630
24638
  /* harmony default export */ var workQuick = (workQuick_component.exports);
24631
- ;// 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=6a724913&scoped=true
24632
- var workNoticevue_type_template_id_6a724913_scoped_true_render = function render() {
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() {
24633
24641
  var _vm = this,
24634
24642
  _c = _vm._self._c;
24635
24643
  return _c('div', {
@@ -24675,7 +24683,7 @@ var workNoticevue_type_template_id_6a724913_scoped_true_render = function render
24675
24683
  }, [_vm._v(_vm._s(notice.flSubject) + "        ")]);
24676
24684
  })], 2) : _vm._e()], 1);
24677
24685
  };
24678
- var workNoticevue_type_template_id_6a724913_scoped_true_staticRenderFns = [];
24686
+ var workNoticevue_type_template_id_5a539700_scoped_true_staticRenderFns = [];
24679
24687
 
24680
24688
  ;// 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
24681
24689
  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); }
@@ -24720,6 +24728,8 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24720
24728
  pageSize: 3,
24721
24729
  pageNum: 1,
24722
24730
  listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
24731
+ // 新版接口优先处理 filter: 'publish'，urlsearch 保留用于兼容旧版本接口
24732
+ filter: 'publish',
24723
24733
  urlsearch: 'endTime>:' + now + ';startTime<:' + now
24724
24734
  });
24725
24735
  case 3:
@@ -24761,9 +24771,9 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
24761
24771
  });
24762
24772
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=script&lang=js
24763
24773
  /* 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-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=6a724913&prod&scoped=true&lang=scss
24765
- var workNoticevue_type_style_index_0_id_6a724913_prod_scoped_true_lang_scss = __webpack_require__(2634);
24766
- ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=6a724913&prod&scoped=true&lang=scss
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
24767
24777
 
24768
24778
  ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue
24769
24779
 
@@ -24776,11 +24786,11 @@ var workNoticevue_type_style_index_0_id_6a724913_prod_scoped_true_lang_scss = __
24776
24786
 
24777
24787
  var workNotice_component = normalizeComponent(
24778
24788
  components_workNoticevue_type_script_lang_js,
24779
- workNoticevue_type_template_id_6a724913_scoped_true_render,
24780
- workNoticevue_type_template_id_6a724913_scoped_true_staticRenderFns,
24789
+ workNoticevue_type_template_id_5a539700_scoped_true_render,
24790
+ workNoticevue_type_template_id_5a539700_scoped_true_staticRenderFns,
24781
24791
  false,
24782
24792
  null,
24783
- "6a724913",
24793
+ "5a539700",
24784
24794
  null
24785
24795
 
24786
24796
  )