ecinc-cloud-yoagwgl 9.6.243 → 9.6.244

package/lib/ecyoagwgl.common.js

@@ -3353,7 +3353,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".svg-icon[data-v-5a28edde]{width:1em;h
 
 /***/ }),
 
-/***/ 798:
+/***/ 1796:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3367,14 +3367,14 @@ __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, ".top-line[data-v-39239143]{float:left;height:36px}.top-line .label[data-v-39239143]{line-height:36px;font-size:var(--portalFontSize14);width:80px}.top-line>div[data-v-39239143]{margin-left:20px;float:left}.top-line>div[data-v-39239143]:first-child{margin-left:0}[data-v-39239143] .el-date-editor .el-range-separator{width:8%}.exportbtn[data-v-39239143]{float:right;height:32px;margin-top:2px}.exportbtn span[data-v-39239143]{margin-left:0}.exportbtn[data-v-39239143]:hover{background:inherit;border-color:#409eff}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".top-line[data-v-7d2e190b]{float:left;height:36px}.top-line .label[data-v-7d2e190b]{line-height:36px;font-size:var(--portalFontSize14);width:80px}.top-line>div[data-v-7d2e190b]{margin-left:20px;float:left}.top-line>div[data-v-7d2e190b]:first-child{margin-left:0}[data-v-7d2e190b] .el-date-editor .el-range-separator{width:8%}.exportbtn[data-v-7d2e190b]{float:right;height:32px;margin-top:2px}.exportbtn span[data-v-7d2e190b]{margin-left:0}.exportbtn[data-v-7d2e190b]:hover{background:inherit;border-color:#409eff}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
 
 /***/ }),
 
-/***/ 1285:
+/***/ 4997:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3388,7 +3388,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, ".echart-box[data-v-05c6b150]{height:300px}.echart-box[data-v-05c6b150],.table-box[data-v-05c6b150]{margin-top:20px;width:100%}.table-box[data-v-05c6b150]{padding-bottom:20px}.search-box[data-v-05c6b150]{height:36px;padding:16px 0 0;-webkit-box-sizing:content-box;box-sizing:content-box}.tabbar[data-v-05c6b150] .el-radio-button--small .el-radio-button__inner{padding:0!important}.tabbar[data-v-05c6b150] .el-radio-button--small .el-radio-button__inner .tabbartext{padding:9px 15px}.tabbar button[data-v-05c6b150]{margin-bottom:-1px}.tabbar button.active[data-v-05c6b150]{color:#fff}.tabbar button.active[data-v-05c6b150]:focus,.tabbar button.active[data-v-05c6b150]:hover{color:#fff!important;border-color:#dcdfe6!important}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".echart-box[data-v-05a0bf9c]{height:300px}.echart-box[data-v-05a0bf9c],.table-box[data-v-05a0bf9c]{margin-top:20px;width:100%}.table-box[data-v-05a0bf9c]{padding-bottom:20px}.search-box[data-v-05a0bf9c]{height:36px;padding:16px 0 0;-webkit-box-sizing:content-box;box-sizing:content-box}.tabbar[data-v-05a0bf9c] .el-radio-button--small .el-radio-button__inner{padding:0!important}.tabbar[data-v-05a0bf9c] .el-radio-button--small .el-radio-button__inner .tabbartext{padding:9px 15px}.tabbar button[data-v-05a0bf9c]{margin-bottom:-1px}.tabbar button.active[data-v-05a0bf9c]{color:#fff}.tabbar button.active[data-v-05a0bf9c]:focus,.tabbar button.active[data-v-05a0bf9c]:hover{color:#fff!important;border-color:#dcdfe6!important}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -38502,35 +38502,35 @@ var update = add("3fc91f19", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 2176:
+/***/ 5242:
 /***/ (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__(798);
+var content = __webpack_require__(1796);
 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("69973b3b", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("3ac66797", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
-/***/ 6363:
+/***/ 3131:
 /***/ (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__(1285);
+var content = __webpack_require__(4997);
 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("1cc691a8", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("7ef4e08c", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -57570,8 +57570,8 @@ var gdgz_component = normalizeComponent(
 )
 
 /* harmony default export */ var gdgz = (gdgz_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/ecyoa/gwgl/src/tjbg/index.vue?vue&type=template&id=05c6b150&scoped=true
-var tjbgvue_type_template_id_05c6b150_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/ecyoa/gwgl/src/tjbg/index.vue?vue&type=template&id=05a0bf9c&scoped=true
+var tjbgvue_type_template_id_05a0bf9c_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -57611,7 +57611,8 @@ var tjbgvue_type_template_id_05c6b150_scoped_true_render = function render() {
       "select-type": _vm.selectType,
       "datearr": _vm.chooseDate,
       "report-type": _vm.reportType,
-      "search-type": _vm.searchType
+      "search-type": _vm.searchType,
+      "time-file-type-options": _vm.timeFileTypeOptions
     },
     on: {
       "changeTypeData": _vm.changeTypeData,
@@ -57672,10 +57673,10 @@ var tjbgvue_type_template_id_05c6b150_scoped_true_render = function render() {
     }
   }) : _vm._e()], 1)]);
 };
-var tjbgvue_type_template_id_05c6b150_scoped_true_staticRenderFns = [];
+var tjbgvue_type_template_id_05a0bf9c_scoped_true_staticRenderFns = [];
 
-;// 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/ecyoa/gwgl/src/tjbg/components/DeptTime.vue?vue&type=template&id=39239143&scoped=true
-var DeptTimevue_type_template_id_39239143_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/ecyoa/gwgl/src/tjbg/components/DeptTime.vue?vue&type=template&id=7d2e190b&scoped=true
+var DeptTimevue_type_template_id_7d2e190b_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -57794,12 +57795,24 @@ var DeptTimevue_type_template_id_39239143_scoped_true_render = function render()
     }
   })], 1)]);
 };
-var DeptTimevue_type_template_id_39239143_scoped_true_staticRenderFns = [];
+var DeptTimevue_type_template_id_7d2e190b_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/ecyoa/gwgl/src/tjbg/components/DeptTime.vue?vue&type=script&lang=js
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 /* harmony default export */ var DeptTimevue_type_script_lang_js = ({
   components: {},
   props: {
+    timeFileTypeOptions: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
+    },
     reportType: {
       type: String,
       default: function _default() {
@@ -57836,7 +57849,7 @@ var DeptTimevue_type_template_id_39239143_scoped_true_staticRenderFns = [];
       loginUser: this.$store.getters.loginUser,
       selectDept: '',
       chooseDate: [],
-      fileList: [{
+      defaultFileList: [{
         title: this.$tx('gwgl.portlet.all', '全部'),
         id: ''
       }, {
@@ -57861,6 +57874,7 @@ var DeptTimevue_type_template_id_39239143_scoped_true_staticRenderFns = [];
         title: this.$tx('gwgl.portlet.requestInstructions', '请示报告'),
         id: this.$tx('gwgl.portlet.requestInstructions', '请示报告')
       }],
+      fileList: [],
       dept: [],
       startT: '',
       endT: ''
@@ -57873,13 +57887,44 @@ var DeptTimevue_type_template_id_39239143_scoped_true_staticRenderFns = [];
       this.selectType = '';
       // this.changeDept()
       // this.changeType()
+      this.refreshFileList();
+    },
+    reportType: function reportType() {
+      this.refreshFileList();
+    },
+    timeFileTypeOptions: {
+      handler: function handler() {
+        this.refreshFileList();
+      },
+      deep: true
     }
   },
   created: function created() {
+    this.refreshFileList();
     this.getdept();
   },
   mounted: function mounted() {},
   methods: {
+    refreshFileList: function refreshFileList() {
+      if (!(this.searchType === 1 && this.reportType === 'nw') && Array.isArray(this.timeFileTypeOptions) && this.timeFileTypeOptions.length > 0) {
+        var allOption = {
+          title: this.$tx('gwgl.portlet.all', '全部'),
+          id: ''
+        };
+        var options = this.timeFileTypeOptions.filter(function (item) {
+          return item && item.name;
+        }).map(function (item) {
+          return {
+            title: item.name,
+            id: item.name,
+            raw: item
+          };
+        });
+        this.fileList = [allOption].concat(_toConsumableArray(options));
+      } else {
+        this.fileList = this.defaultFileList;
+      }
+    },
     changeDept: function changeDept(value) {
       // if (value === undefined) return
       var deptName = '';
@@ -57893,7 +57938,15 @@ var DeptTimevue_type_template_id_39239143_scoped_true_staticRenderFns = [];
       });
     },
     changeType: function changeType() {
-      this.$emit('changeTypeData', this.selectType);
+      var _this = this;
+      var picked = this.fileList.find(function (item) {
+        return item && item.id === _this.selectType;
+      });
+      if (picked && picked.raw) {
+        this.$emit('changeTypeData', picked.raw);
+      } else {
+        this.$emit('changeTypeData', this.selectType);
+      }
     },
     changeTime: function changeTime() {
       this.chooseDate = this.datearr;
@@ -57901,7 +57954,7 @@ var DeptTimevue_type_template_id_39239143_scoped_true_staticRenderFns = [];
     },
     // 获取部门
     getdept: function getdept() {
-      var _this = this;
+      var _this2 = this;
       this.$http({
         url: 'base/organMgr/findAllOrganByOrgCode',
         method: 'GET',
@@ -57916,13 +57969,13 @@ var DeptTimevue_type_template_id_39239143_scoped_true_staticRenderFns = [];
             return item.orgLevel === 2;
           });
           list.unshift({
-            name: _this.$tx('gwgl.tjbg.allDepart', '所有部门'),
+            name: _this2.$tx('gwgl.tjbg.allDepart', '所有部门'),
             id: ''
           });
-          _this.dept = list;
+          _this2.dept = list;
           // this.$emit('dept', this.dept)
         } else {
-          _this.$message.error(res.message);
+          _this2.$message.error(res.message);
         }
       });
     }
@@ -57930,9 +57983,9 @@ var DeptTimevue_type_template_id_39239143_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/gwgl/src/tjbg/components/DeptTime.vue?vue&type=script&lang=js
  /* harmony default export */ var components_DeptTimevue_type_script_lang_js = (DeptTimevue_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/ecyoa/gwgl/src/tjbg/components/DeptTime.vue?vue&type=style&index=0&id=39239143&prod&scoped=true&lang=scss
-var DeptTimevue_type_style_index_0_id_39239143_prod_scoped_true_lang_scss = __webpack_require__(2176);
-;// CONCATENATED MODULE: ./packages/ecyoa/gwgl/src/tjbg/components/DeptTime.vue?vue&type=style&index=0&id=39239143&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/ecyoa/gwgl/src/tjbg/components/DeptTime.vue?vue&type=style&index=0&id=7d2e190b&prod&scoped=true&lang=scss
+var DeptTimevue_type_style_index_0_id_7d2e190b_prod_scoped_true_lang_scss = __webpack_require__(5242);
+;// CONCATENATED MODULE: ./packages/ecyoa/gwgl/src/tjbg/components/DeptTime.vue?vue&type=style&index=0&id=7d2e190b&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/gwgl/src/tjbg/components/DeptTime.vue
 
@@ -57945,11 +57998,11 @@ var DeptTimevue_type_style_index_0_id_39239143_prod_scoped_true_lang_scss = __we
 
 var DeptTime_component = normalizeComponent(
   components_DeptTimevue_type_script_lang_js,
-  DeptTimevue_type_template_id_39239143_scoped_true_render,
-  DeptTimevue_type_template_id_39239143_scoped_true_staticRenderFns,
+  DeptTimevue_type_template_id_7d2e190b_scoped_true_render,
+  DeptTimevue_type_template_id_7d2e190b_scoped_true_staticRenderFns,
   false,
   null,
-  "39239143",
+  "7d2e190b",
   null
   
 )
@@ -58115,6 +58168,12 @@ var DataTable_component = normalizeComponent(
 /* harmony default export */ var DataTable = (DataTable_component.exports);
 ;// 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/ecyoa/gwgl/src/tjbg/index.vue?vue&type=script&lang=js
 function tjbgvue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return tjbgvue_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; }, tjbgvue_type_script_lang_js_typeof(o); }
+function tjbgvue_type_script_lang_js_toConsumableArray(r) { return tjbgvue_type_script_lang_js_arrayWithoutHoles(r) || tjbgvue_type_script_lang_js_iterableToArray(r) || tjbgvue_type_script_lang_js_unsupportedIterableToArray(r) || tjbgvue_type_script_lang_js_nonIterableSpread(); }
+function tjbgvue_type_script_lang_js_nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function tjbgvue_type_script_lang_js_unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return tjbgvue_type_script_lang_js_arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? tjbgvue_type_script_lang_js_arrayLikeToArray(r, a) : void 0; } }
+function tjbgvue_type_script_lang_js_iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function tjbgvue_type_script_lang_js_arrayWithoutHoles(r) { if (Array.isArray(r)) return tjbgvue_type_script_lang_js_arrayLikeToArray(r); }
+function tjbgvue_type_script_lang_js_arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function tjbgvue_type_script_lang_js_regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ tjbgvue_type_script_lang_js_regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == tjbgvue_type_script_lang_js_typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(tjbgvue_type_script_lang_js_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function tjbgvue_type_script_lang_js_asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function tjbgvue_type_script_lang_js_asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { tjbgvue_type_script_lang_js_asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { tjbgvue_type_script_lang_js_asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
@@ -58431,27 +58490,50 @@ var tjbgvue_type_script_lang_js_moment = __webpack_require__(5093);
       loading: false,
       // 数据加载状态
       tooltipFormat: null,
-      deptName: '所有部门' // 部门名称
+      deptName: '所有部门',
+      // 部门名称
+      timeFileTypeOptions: [],
+      timeFileTypeLoaded: false,
+      selectedFileTypeItem: null
     };
   },
   computed: {},
   watch: {
     searchType: function searchType(val) {
-      this.title = this.titleList[this.reportType].text;
-      if ((this.reportType === 'nw' || this.reportType === 'bw') && val === 2) {
-        this.initDate('month');
-      } else {
-        this.initDate('day');
-      }
-      if (!((this.reportType === 'bwxl' || this.reportType === 'cql') && this.searchType === 2)) {
-        this.selectDept = '';
-        this.selectType = '';
-        // this.deptName = '所有部门'
-        this.deptName = this.$tx('gwgl.tjbg.allDepart', '所有部门');
-      } else {
-        this.listTb[0].title = this.$tx('gwgl.tjbg.name', '姓名');
-      }
-      this.getReportList();
+      var _this = this;
+      return tjbgvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/tjbgvue_type_script_lang_js_regeneratorRuntime().mark(function _callee() {
+        return tjbgvue_type_script_lang_js_regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _this.title = _this.titleList[_this.reportType].text;
+              if ((_this.reportType === 'nw' || _this.reportType === 'bw') && val === 2) {
+                _this.initDate('month');
+              } else {
+                _this.initDate('day');
+              }
+              if (!((_this.reportType === 'bwxl' || _this.reportType === 'cql') && _this.searchType === 2)) {
+                _this.selectDept = '';
+                _this.selectType = '';
+                _this.selectedFileTypeItem = null;
+                // this.deptName = '所有部门'
+                _this.deptName = _this.$tx('gwgl.tjbg.allDepart', '所有部门');
+              } else {
+                _this.listTb[0].title = _this.$tx('gwgl.tjbg.name', '姓名');
+              }
+              if (_this.reportType === 'nw' && val === 1) {
+                _context.next = 6;
+                break;
+              }
+              _context.next = 6;
+              return _this.loadTimeFileTypeOptions();
+            case 6:
+              _this.getReportList();
+            case 7:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }))();
     }
   },
   created: function created() {
@@ -58496,6 +58578,119 @@ var tjbgvue_type_script_lang_js_moment = __webpack_require__(5093);
     this.$bus.emit('showNavSearch', true); // 还原右上搜索按钮
   },
   methods: {
+    flattenMenuItems: function flattenMenuItems(items) {
+      var result = [];
+      var stack = Array.isArray(items) ? tjbgvue_type_script_lang_js_toConsumableArray(items) : [];
+      while (stack.length > 0) {
+        var item = stack.shift();
+        if (!item) continue;
+        result.push(item);
+        if (Array.isArray(item.children) && item.children.length > 0) {
+          stack.push.apply(stack, tjbgvue_type_script_lang_js_toConsumableArray(item.children));
+        }
+      }
+      return result;
+    },
+    resolveModuleByMenuItem: function resolveModuleByMenuItem(item) {
+      var href = item && item.href ? String(item.href) : '';
+      if (Number(item && item.leafType) === 4) {
+        var match = href.match(/[?&]busiCode=([^&]+)/);
+        if (match && match[1]) return decodeURIComponent(match[1]);
+      }
+      return href;
+    },
+    loadTimeFileTypeOptions: function loadTimeFileTypeOptions() {
+      var _this2 = this;
+      return tjbgvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/tjbgvue_type_script_lang_js_regeneratorRuntime().mark(function _callee2() {
+        var res, response, list, flat;
+        return tjbgvue_type_script_lang_js_regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!_this2.timeFileTypeLoaded) {
+                _context2.next = 2;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 2:
+              _context2.next = 4;
+              return _this2.$http({
+                method: 'GET',
+                url: 'homepage/findAllCreateWflowMenu',
+                params: {
+                  findType: 'menuItem',
+                  productCode: 'ecygwgl'
+                }
+              });
+            case 4:
+              res = _context2.sent;
+              response = res && res.code ? res : res && res.data ? res.data : res;
+              if (!(!response || response.code !== 'success')) {
+                _context2.next = 8;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 8:
+              list = response.body && (response.body.listdata || response.body.data) || response.body || [];
+              flat = _this2.flattenMenuItems(list);
+              _this2.timeFileTypeOptions = flat.filter(function (item) {
+                return (item.leafFlag === 1 || !item.children || item.children.length === 0) && item.name && item.href;
+              }).map(function (item) {
+                return {
+                  name: item.name,
+                  href: item.href,
+                  leafType: item.leafType
+                };
+              });
+              _this2.timeFileTypeLoaded = true;
+            case 12:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }))();
+    },
+    getLegacyModuleByFileName: function getLegacyModuleByFileName(fileName) {
+      var _module = '';
+      switch (fileName) {
+        case '':
+          _module = 'fawen,shouwen,wjcy,bmbh,yjzj,hytz,qsbg';
+          break;
+        case '单位发文':
+          _module = 'fawen';
+          break;
+        case '部门收文':
+          _module = 'shouwen';
+          break;
+        case '收文阅办':
+          _module = 'shouwen';
+          break;
+        case '文件传阅':
+          _module = 'wjcy';
+          break;
+        case '部门便函':
+          _module = 'bmbh';
+          break;
+        case '意见征集':
+          _module = 'yjzj';
+          break;
+        case '请示报告':
+          _module = 'qsbg';
+          break;
+        default:
+          _module = 'fawen,shouwen,wjcy,bmbh,yjzj,hytz,qsbg';
+          break;
+      }
+      return _module;
+    },
+    getAllTimeModules: function getAllTimeModules() {
+      var _this3 = this;
+      var modules = this.timeFileTypeOptions.map(function (item) {
+        return _this3.resolveModuleByMenuItem(item);
+      }).filter(function (m) {
+        return m;
+      });
+      return Array.from(new Set(modules)).join(',');
+    },
     echartsClick: function echartsClick() {
       return false;
     },
@@ -58544,91 +58739,89 @@ var tjbgvue_type_script_lang_js_moment = __webpack_require__(5093);
       }
     },
     getReportList: function getReportList() {
-      var _this = this;
-      return tjbgvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/tjbgvue_type_script_lang_js_regeneratorRuntime().mark(function _callee() {
-        var _module, param, res;
-        return tjbgvue_type_script_lang_js_regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _this4 = this;
+      return tjbgvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/tjbgvue_type_script_lang_js_regeneratorRuntime().mark(function _callee3() {
+        var fileName, _module, showFileType, picked, param, res;
+        return tjbgvue_type_script_lang_js_regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              fileName = _this4.selectType;
               _module = '';
-              _context.t0 = _this.selectType;
-              _context.next = _context.t0 === '' ? 4 : _context.t0 === '单位发文' ? 6 : _context.t0 === '部门收文' ? 8 : _context.t0 === '收文阅办' ? 10 : _context.t0 === '文件传阅' ? 12 : _context.t0 === '部门便函' ? 14 : _context.t0 === '意见征集' ? 16 : _context.t0 === '请示报告' ? 18 : 20;
+              showFileType = !(_this4.reportType === 'nw' && _this4.searchType === 1);
+              if (!showFileType) {
+                _context3.next = 11;
+                break;
+              }
+              if (_this4.timeFileTypeLoaded) {
+                _context3.next = 7;
+                break;
+              }
+              _context3.next = 7;
+              return _this4.loadTimeFileTypeOptions();
+            case 7:
+              picked = _this4.selectedFileTypeItem || _this4.timeFileTypeOptions.find(function (item) {
+                return item.name === _this4.selectType;
+              }) || null;
+              if (picked) {
+                fileName = picked.name;
+                _module = _this4.resolveModuleByMenuItem(picked);
+              } else if (_this4.selectType === '') {
+                _module = _this4.timeFileTypeLoaded ? _this4.getAllTimeModules() : _this4.getLegacyModuleByFileName('');
+              } else {
+                _module = _this4.getLegacyModuleByFileName(_this4.selectType);
+              }
+              _context3.next = 12;
               break;
-            case 4:
-              _module = 'fawen,shouwen,wjcy,bmbh,yjzj,hytz,qsbg';
-              return _context.abrupt("break", 22);
-            case 6:
-              _module = 'fawen';
-              return _context.abrupt("break", 22);
-            case 8:
-              _module = 'shouwen';
-              return _context.abrupt("break", 22);
-            case 10:
-              _module = 'shouwen';
-              return _context.abrupt("break", 22);
+            case 11:
+              _module = _this4.getLegacyModuleByFileName(_this4.selectType);
             case 12:
-              _module = 'wjcy';
-              return _context.abrupt("break", 22);
-            case 14:
-              _module = 'bmbh';
-              return _context.abrupt("break", 22);
-            case 16:
-              _module = 'yjzj';
-              return _context.abrupt("break", 22);
-            case 18:
-              _module = 'qsbg';
-              return _context.abrupt("break", 22);
-            case 20:
-              _module = 'fawen,shouwen,wjcy,bmbh,yjzj,hytz,qsbg';
-              return _context.abrupt("break", 22);
-            case 22:
               param = {
-                deptId: _this.selectDept,
-                endTime: _this.chooseDate[1],
-                startTime: _this.chooseDate[0],
+                deptId: _this4.selectDept,
+                endTime: _this4.chooseDate[1],
+                startTime: _this4.chooseDate[0],
                 // sysCode: this.$route.meta.sysCode,
-                type: _this.searchType,
-                fileName: _this.selectType,
+                type: _this4.searchType,
+                fileName: fileName,
                 module: _module
               };
-              _this.loading = true;
-              _this.listData = [];
-              _context.next = 27;
-              return _this.$app.listdata(_this.url, param);
-            case 27:
-              res = _context.sent;
+              _this4.loading = true;
+              _this4.listData = [];
+              _context3.next = 17;
+              return _this4.$app.listdata(_this4.url, param);
+            case 17:
+              res = _context3.sent;
               if (res.code === 'success') {
-                _this.mergeList(res.body.listdata);
+                _this4.mergeList(res.body.listdata);
               }
-              _this.loading = false;
-            case 30:
+              _this4.loading = false;
+            case 20:
             case "end":
-              return _context.stop();
+              return _context3.stop();
           }
-        }, _callee);
+        }, _callee3);
       }))();
     },
     mergeList: function mergeList(arr) {
-      var _this2 = this;
+      var _this5 = this;
       var self = this;
       var x = [];
       var y = [];
       arr.forEach(function (item) {
-        if (_this2.reportType === 'nw' || _this2.reportType === 'bw') {
-          if (_this2.searchType === 1) {
+        if (_this5.reportType === 'nw' || _this5.reportType === 'bw') {
+          if (_this5.searchType === 1) {
             x.push(item.name);
             y.push(item.num);
-          } else if (_this2.searchType === 2) {
+          } else if (_this5.searchType === 2) {
             x.push(item.createDate);
             y.push(item.num);
           }
         }
-        if (_this2.reportType === 'bwxl') {
+        if (_this5.reportType === 'bwxl') {
           x.push(item.name);
           y.push(JSON.parse(JSON.stringify(item.avgMinute)) / 60);
-          item.avgMinute = _this2.mergeMinute(item.avgMinute);
+          item.avgMinute = _this5.mergeMinute(item.avgMinute);
         }
-        if (_this2.reportType === 'thl' || _this2.reportType === 'cql') {
+        if (_this5.reportType === 'thl' || _this5.reportType === 'cql') {
           x.push(item.name);
           y.push((item.lv * 100).toFixed(2));
           item.lv = (item.lv * 100).toFixed(2) + '%';
@@ -58712,7 +58905,20 @@ var tjbgvue_type_script_lang_js_moment = __webpack_require__(5093);
       this.chooseDate = params;
     },
     changeTypeData: function changeTypeData(params) {
-      this.selectType = params;
+      var _this6 = this;
+      if (params && tjbgvue_type_script_lang_js_typeof(params) === 'object') {
+        this.selectedFileTypeItem = params;
+        this.selectType = params.name || '';
+      } else {
+        this.selectType = params;
+        if (!(this.reportType === 'nw' && this.searchType === 1) && this.selectType) {
+          this.selectedFileTypeItem = this.timeFileTypeOptions.find(function (item) {
+            return item.name === _this6.selectType;
+          }) || null;
+        } else {
+          this.selectedFileTypeItem = null;
+        }
+      }
     },
     tabClickHandler: function tabClickHandler(item) {
       // if (this.searchType === item.type) return
@@ -58722,14 +58928,15 @@ var tjbgvue_type_script_lang_js_moment = __webpack_require__(5093);
       this.yUnit = item.yUnit;
       this.listTb = item.td;
       this.selectType = '';
+      this.selectedFileTypeItem = null;
     }
   }
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/gwgl/src/tjbg/index.vue?vue&type=script&lang=js
  /* harmony default export */ var src_tjbgvue_type_script_lang_js = (tjbgvue_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/ecyoa/gwgl/src/tjbg/index.vue?vue&type=style&index=0&id=05c6b150&prod&scoped=true&lang=scss
-var tjbgvue_type_style_index_0_id_05c6b150_prod_scoped_true_lang_scss = __webpack_require__(6363);
-;// CONCATENATED MODULE: ./packages/ecyoa/gwgl/src/tjbg/index.vue?vue&type=style&index=0&id=05c6b150&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/ecyoa/gwgl/src/tjbg/index.vue?vue&type=style&index=0&id=05a0bf9c&prod&scoped=true&lang=scss
+var tjbgvue_type_style_index_0_id_05a0bf9c_prod_scoped_true_lang_scss = __webpack_require__(3131);
+;// CONCATENATED MODULE: ./packages/ecyoa/gwgl/src/tjbg/index.vue?vue&type=style&index=0&id=05a0bf9c&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/gwgl/src/tjbg/index.vue
 
@@ -58742,11 +58949,11 @@ var tjbgvue_type_style_index_0_id_05c6b150_prod_scoped_true_lang_scss = __webpac
 
 var tjbg_component = normalizeComponent(
   src_tjbgvue_type_script_lang_js,
-  tjbgvue_type_template_id_05c6b150_scoped_true_render,
-  tjbgvue_type_template_id_05c6b150_scoped_true_staticRenderFns,
+  tjbgvue_type_template_id_05a0bf9c_scoped_true_render,
+  tjbgvue_type_template_id_05a0bf9c_scoped_true_staticRenderFns,
   false,
   null,
-  "05c6b150",
+  "05a0bf9c",
   null
   
 )