ecinc-cloud-moadesktop 9.7.13 → 9.7.14

package/lib/ecmoadesktop.common.js

@@ -816,7 +816,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-cf6d8e06]{display:-web
 
 /***/ }),
 
-/***/ 909:
+/***/ 9817:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -830,7 +830,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, "#van-no[data-v-2687a432]{min-height:40px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "#van-no[data-v-5cb17588]{min-height:40px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -909,7 +909,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-fc36d506]{display:-web
 
 /***/ }),
 
-/***/ 9425:
+/***/ 8784:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -923,7 +923,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-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}", ""]);
+___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}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -22863,19 +22863,19 @@ var update = add("2dc7bde0", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 3599:
+/***/ 5899:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(909);
+var content = __webpack_require__(9817);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("ce5a167e", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("460661b2", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -22927,19 +22927,19 @@ var update = add("6c455223", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 3755:
+/***/ 4458:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(9425);
+var content = __webpack_require__(8784);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("b42e786e", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("3f43ab46", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -23436,7 +23436,7 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-;// 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
+;// 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
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -23490,32 +23490,40 @@ var render = function render() {
     return _c('div', {
       key: item.id,
       staticClass: "tzgg-item",
+      staticStyle: {
+        "display": "flex",
+        "flex-direction": "column",
+        "align-items": "stretch"
+      },
       on: {
         "click": function click($event) {
           return _vm.clickItem(item);
         }
       }
     }, [_c('div', {
-      staticClass: "left"
-    }, [_c('span', {
+      staticClass: "title-line",
       staticStyle: {
-        "font-weight": "bold",
-        "color": "#333333",
-        "font-size": "16px"
+        "display": "flex",
+        "align-items": "center"
       }
-    }, [_vm._v(_vm._s(new Date(item.startTime).getDate()))]), _c('span', {
+    }, [_c('span', {
+      staticClass: "type-tag",
+      class: 'type-' + _vm.typeClass(item.type),
       staticStyle: {
-        "color": "#999999",
-        "font-size": "12px"
+        "flex-shrink": "0"
       }
-    }, [_vm._v(_vm._s(new Date(item.startTime).getFullYear()) + "." + _vm._s(new Date(item.startTime).getMonth() + 1))])]), _c('div', {
-      staticClass: "right"
-    }, [_c('span', {
+    }, [_vm._v(_vm._s(item.type))]), _c('span', {
+      staticClass: "subject"
+    }, [_vm._v(_vm._s(item.flSubject))])]), _c('div', {
+      staticClass: "meta",
       staticStyle: {
-        "font-size": "14px",
-        "color": "#333333"
+        "display": "flex",
+        "justify-content": "space-between",
+        "align-items": "center"
       }
-    }, [_vm._v(_vm._s(item.flSubject))])])]);
+    }, [_c('span', [_vm._v(_vm._s(_vm.formatTime(item.startTime)))]), item.flCreateDept ? _c('span', {
+      staticClass: "dept"
+    }, [_vm._v(_vm._s(item.flCreateDept))]) : _vm._e()])]);
   }), _vm.list.length === 0 ? _c('div', {
     staticClass: "no-data"
   }, [_c('img', {
@@ -23595,6 +23603,19 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
         }, _callee);
       }))();
     },
+    typeClass: function typeClass(type) {
+      // 公告类型标签统一使用蓝色系配色，不同类型深浅区分
+      var map = {
+        通知: 'notice',
+        公告: 'announcement',
+        通报: 'bulletin'
+      };
+      return map[type] || 'other';
+    },
+    formatTime: function formatTime(time) {
+      var moment = __webpack_require__(5093);
+      return time ? moment(time).format('YYYY.M.DD HH:mm') : '';
+    },
     getData: function getData() {
       var _this2 = this;
       var moment = __webpack_require__(5093);
@@ -23605,7 +23626,7 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
         pageSize: 10,
         pageNum: 1,
         listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
-        orderBy: 'topDate desc',
+        orderBy: 'topDate desc,startTime desc',
         filter: 'all',
         urlsearch: 'endTime>:' + nowtime + ';startTime<:' + nowtime
       }).then(function (resp) {
@@ -23624,9 +23645,9 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=script&lang=js
  /* harmony default export */ var components_workTzggvue_type_script_lang_js = (workTzggvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=fecde4f4&prod&scoped=true&lang=scss
-var workTzggvue_type_style_index_0_id_fecde4f4_prod_scoped_true_lang_scss = __webpack_require__(3755);
-;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=fecde4f4&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=40042392&prod&scoped=true&lang=scss
+var workTzggvue_type_style_index_0_id_40042392_prod_scoped_true_lang_scss = __webpack_require__(4458);
+;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=40042392&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 /* globals __VUE_SSR_CONTEXT__ */
@@ -23741,7 +23762,7 @@ var component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "fecde4f4",
+  "40042392",
   null
   
 )
@@ -24626,8 +24647,8 @@ var workQuick_component = normalizeComponent(
 )
 
 /* harmony default export */ var workQuick = (workQuick_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=template&id=2687a432&scoped=true
-var workNoticevue_type_template_id_2687a432_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=template&id=5cb17588&scoped=true
+var workNoticevue_type_template_id_5cb17588_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -24673,7 +24694,7 @@ var workNoticevue_type_template_id_2687a432_scoped_true_render = function render
     }, [_vm._v(_vm._s(notice.flSubject) + "        ")]);
   })], 2) : _vm._e()], 1);
 };
-var workNoticevue_type_template_id_2687a432_scoped_true_staticRenderFns = [];
+var workNoticevue_type_template_id_5cb17588_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=script&lang=js
 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); }
@@ -24733,6 +24754,7 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
                 pageSize: 3,
                 pageNum: 1,
                 listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
+                orderBy: 'topDate desc,startTime desc',
                 filter: 'notRead',
                 urlsearch: 'endTime>:' + now + ';startTime<:' + now
               });
@@ -24824,9 +24846,9 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=script&lang=js
  /* harmony default export */ var components_workNoticevue_type_script_lang_js = (workNoticevue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=2687a432&prod&scoped=true&lang=scss
-var workNoticevue_type_style_index_0_id_2687a432_prod_scoped_true_lang_scss = __webpack_require__(3599);
-;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=2687a432&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=5cb17588&prod&scoped=true&lang=scss
+var workNoticevue_type_style_index_0_id_5cb17588_prod_scoped_true_lang_scss = __webpack_require__(5899);
+;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=5cb17588&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue
 
@@ -24839,11 +24861,11 @@ var workNoticevue_type_style_index_0_id_2687a432_prod_scoped_true_lang_scss = __
 
 var workNotice_component = normalizeComponent(
   components_workNoticevue_type_script_lang_js,
-  workNoticevue_type_template_id_2687a432_scoped_true_render,
-  workNoticevue_type_template_id_2687a432_scoped_true_staticRenderFns,
+  workNoticevue_type_template_id_5cb17588_scoped_true_render,
+  workNoticevue_type_template_id_5cb17588_scoped_true_staticRenderFns,
   false,
   null,
-  "2687a432",
+  "5cb17588",
   null
   
 )

package/lib/ecmoadesktop.umd.js

@@ -826,7 +826,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-cf6d8e06]{display:-web
 
 /***/ }),
 
-/***/ 616:
+/***/ 9207:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -840,7 +840,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, "#van-no[data-v-2687a432]{min-height:40px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "#van-no[data-v-5cb17588]{min-height:40px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -919,7 +919,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-fc36d506]{display:-web
 
 /***/ }),
 
-/***/ 3087:
+/***/ 2038:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -933,7 +933,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".no-data[data-v-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}", ""]);
+___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}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -22873,19 +22873,19 @@ var update = add("f5a9f960", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 3924:
+/***/ 9816:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(616);
+var content = __webpack_require__(9207);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("1bb291fe", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("36509167", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -22937,19 +22937,19 @@ var update = add("08543463", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 1576:
+/***/ 5737:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(3087);
+var content = __webpack_require__(2038);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("41f7a609", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("495ae4f4", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -23446,7 +23446,7 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-;// 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
+;// 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
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -23500,32 +23500,40 @@ var render = function render() {
     return _c('div', {
       key: item.id,
       staticClass: "tzgg-item",
+      staticStyle: {
+        "display": "flex",
+        "flex-direction": "column",
+        "align-items": "stretch"
+      },
       on: {
         "click": function click($event) {
           return _vm.clickItem(item);
         }
       }
     }, [_c('div', {
-      staticClass: "left"
-    }, [_c('span', {
+      staticClass: "title-line",
       staticStyle: {
-        "font-weight": "bold",
-        "color": "#333333",
-        "font-size": "16px"
+        "display": "flex",
+        "align-items": "center"
       }
-    }, [_vm._v(_vm._s(new Date(item.startTime).getDate()))]), _c('span', {
+    }, [_c('span', {
+      staticClass: "type-tag",
+      class: 'type-' + _vm.typeClass(item.type),
       staticStyle: {
-        "color": "#999999",
-        "font-size": "12px"
+        "flex-shrink": "0"
       }
-    }, [_vm._v(_vm._s(new Date(item.startTime).getFullYear()) + "." + _vm._s(new Date(item.startTime).getMonth() + 1))])]), _c('div', {
-      staticClass: "right"
-    }, [_c('span', {
+    }, [_vm._v(_vm._s(item.type))]), _c('span', {
+      staticClass: "subject"
+    }, [_vm._v(_vm._s(item.flSubject))])]), _c('div', {
+      staticClass: "meta",
       staticStyle: {
-        "font-size": "14px",
-        "color": "#333333"
+        "display": "flex",
+        "justify-content": "space-between",
+        "align-items": "center"
       }
-    }, [_vm._v(_vm._s(item.flSubject))])])]);
+    }, [_c('span', [_vm._v(_vm._s(_vm.formatTime(item.startTime)))]), item.flCreateDept ? _c('span', {
+      staticClass: "dept"
+    }, [_vm._v(_vm._s(item.flCreateDept))]) : _vm._e()])]);
   }), _vm.list.length === 0 ? _c('div', {
     staticClass: "no-data"
   }, [_c('img', {
@@ -23605,6 +23613,19 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
         }, _callee);
       }))();
     },
+    typeClass: function typeClass(type) {
+      // 公告类型标签统一使用蓝色系配色，不同类型深浅区分
+      var map = {
+        通知: 'notice',
+        公告: 'announcement',
+        通报: 'bulletin'
+      };
+      return map[type] || 'other';
+    },
+    formatTime: function formatTime(time) {
+      var moment = __webpack_require__(5093);
+      return time ? moment(time).format('YYYY.M.DD HH:mm') : '';
+    },
     getData: function getData() {
       var _this2 = this;
       var moment = __webpack_require__(5093);
@@ -23615,7 +23636,7 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
         pageSize: 10,
         pageNum: 1,
         listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
-        orderBy: 'topDate desc',
+        orderBy: 'topDate desc,startTime desc',
         filter: 'all',
         urlsearch: 'endTime>:' + nowtime + ';startTime<:' + nowtime
       }).then(function (resp) {
@@ -23634,9 +23655,9 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=script&lang=js
  /* harmony default export */ var components_workTzggvue_type_script_lang_js = (workTzggvue_type_script_lang_js); 
-// 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
-var workTzggvue_type_style_index_0_id_fecde4f4_prod_scoped_true_lang_scss = __webpack_require__(1576);
-;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=fecde4f4&prod&scoped=true&lang=scss
+// 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
+var workTzggvue_type_style_index_0_id_40042392_prod_scoped_true_lang_scss = __webpack_require__(5737);
+;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workTzgg.vue?vue&type=style&index=0&id=40042392&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 /* globals __VUE_SSR_CONTEXT__ */
@@ -23751,7 +23772,7 @@ var component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "fecde4f4",
+  "40042392",
   null
   
 )
@@ -24636,8 +24657,8 @@ var workQuick_component = normalizeComponent(
 )
 
 /* harmony default export */ var workQuick = (workQuick_component.exports);
-;// 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=2687a432&scoped=true
-var workNoticevue_type_template_id_2687a432_scoped_true_render = function render() {
+;// 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
+var workNoticevue_type_template_id_5cb17588_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -24683,7 +24704,7 @@ var workNoticevue_type_template_id_2687a432_scoped_true_render = function render
     }, [_vm._v(_vm._s(notice.flSubject) + "        ")]);
   })], 2) : _vm._e()], 1);
 };
-var workNoticevue_type_template_id_2687a432_scoped_true_staticRenderFns = [];
+var workNoticevue_type_template_id_5cb17588_scoped_true_staticRenderFns = [];
 
 ;// 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
 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); }
@@ -24743,6 +24764,7 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
                 pageSize: 3,
                 pageNum: 1,
                 listpageViewUrl: 'ecoa.dzgg.listPublished.vue',
+                orderBy: 'topDate desc,startTime desc',
                 filter: 'notRead',
                 urlsearch: 'endTime>:' + now + ';startTime<:' + now
               });
@@ -24834,9 +24856,9 @@ function workNoticevue_type_script_lang_js_asyncToGenerator(n) { return function
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=script&lang=js
  /* harmony default export */ var components_workNoticevue_type_script_lang_js = (workNoticevue_type_script_lang_js); 
-// 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=2687a432&prod&scoped=true&lang=scss
-var workNoticevue_type_style_index_0_id_2687a432_prod_scoped_true_lang_scss = __webpack_require__(3924);
-;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=2687a432&prod&scoped=true&lang=scss
+// 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
+var workNoticevue_type_style_index_0_id_5cb17588_prod_scoped_true_lang_scss = __webpack_require__(9816);
+;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue?vue&type=style&index=0&id=5cb17588&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmoa/desktop/src/components/workNotice.vue
 
@@ -24849,11 +24871,11 @@ var workNoticevue_type_style_index_0_id_2687a432_prod_scoped_true_lang_scss = __
 
 var workNotice_component = normalizeComponent(
   components_workNoticevue_type_script_lang_js,
-  workNoticevue_type_template_id_2687a432_scoped_true_render,
-  workNoticevue_type_template_id_2687a432_scoped_true_staticRenderFns,
+  workNoticevue_type_template_id_5cb17588_scoped_true_render,
+  workNoticevue_type_template_id_5cb17588_scoped_true_staticRenderFns,
   false,
   null,
-  "2687a432",
+  "5cb17588",
   null
   
 )