Browse Source

feat: GLY-5708 后台部分(养护/公路)

Tony Kang 2 tháng trước cách đây
mục cha
commit
4c18659c9b
2 tập tin đã thay đổi với 12 bổ sung29 xóa
  1. 2 0
      public/web/rpt_value_define.js
  2. 10 29
      web/maintain/report/js/rpt_tpl_calculation.js

+ 2 - 0
public/web/rpt_value_define.js

@@ -225,6 +225,8 @@ const JV = {
 
   RUN_TYPE_BEFORE_GROUP_TEXT_OUT: "before_group_text_output",
 
+  RUN_TYPE_RESET_CROSS_COLUMNS: 'reset_cross_columns',
+
   PAGE_STATUS: [
     "EveryPage",
     "FirstPage",

+ 10 - 29
web/maintain/report/js/rpt_tpl_calculation.js

@@ -44,32 +44,13 @@ let calculationTreeOprObj = {
   },
   buildRunType: function () {
     let et = $("#exprRunType");
-    et.append(
-      "<option value='" + JV.RUN_TYPE_BEFORE_PAGING + "'>默认运行</option>"
-    );
-    et.append(
-      "<option value='" + JV.RUN_TYPE_BEFORE_OUTPUT + "'>每页实时运行</option>"
-    );
-    et.append(
-      "<option value='" +
-        JV.RUN_TYPE_BEFORE_ANALYZING +
-        "'>数据分析前运行</option>"
-    );
-    et.append(
-      "<option value='" +
-        JV.RUN_TYPE_BEFORE_COMBINE +
-        "'>合并单元格前事件</option>"
-    );
-    et.append(
-      "<option value='" +
-        JV.RUN_TYPE_AFTER_COMBINE +
-        "'>合并单元格后事件</option>"
-    );
-    et.append(
-      "<option value='" +
-        JV.RUN_TYPE_BEFORE_GROUP_TEXT_OUT +
-        "'>分组text输出前事件</option>"
-    );
+    et.append(`<option value="${JV.RUN_TYPE_BEFORE_PAGING}">默认运行</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_BEFORE_OUTPUT}">每页实时运行</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_BEFORE_ANALYZING}">数据分析前运行</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_BEFORE_COMBINE}">合并单元格前事件</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_AFTER_COMBINE}">合并单元格后事件</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_BEFORE_GROUP_TEXT_OUT}">分组text输出前事件</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_RESET_CROSS_COLUMNS}">重设交叉表列数</option>`);
   },
   buildTreeData: function (rptTpl) {
     let me = this,
@@ -142,10 +123,10 @@ let calculationTreeOprObj = {
         $("#exprRunType")[0].selectedIndex = 3;
       } else if (treeNode[JV.PROP_RUN_TYPE] === JV.RUN_TYPE_AFTER_COMBINE) {
         $("#exprRunType")[0].selectedIndex = 4;
-      } else if (
-        treeNode[JV.PROP_RUN_TYPE] === JV.RUN_TYPE_BEFORE_GROUP_TEXT_OUT
-      ) {
+      } else if (treeNode[JV.PROP_RUN_TYPE] === JV.RUN_TYPE_BEFORE_GROUP_TEXT_OUT) {
         $("#exprRunType")[0].selectedIndex = 5;
+      } else if (treeNode[JV.PROP_RUN_TYPE] === JV.RUN_TYPE_RESET_CROSS_COLUMNS) {
+        $("#exprRunType")[0].selectedIndex = 6;
       } else {
         $("#exprRunType")[0].selectedIndex = 2;
       }