zhujiamin 发布系统代码 [TrainSys，网页端]

092a1353 · ibizdev · 04a1fa37 · 092a1353 · 092a1353 · 092a1353
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301490997.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301490997.json
@@ -66,11 +66,7 @@
    "name" : "line_0-DEFAULT",
    "getPSChartDataSetFields" : [ {
      "index" : 0,
-      "name" : "NAME",
-      "getPSCodeList" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-      },
+      "name" : "ADDRESS",
      "groupField" : true,
      "id" : "0"
    }, {
@@ -128,11 +124,7 @@
  },
  "getPSDEChartSerieses" : [ {
    "caption" : "学生年龄信息",
-    "catalogField" : "NAME",
-    "getCatalogPSCodeList" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-    },
+    "catalogField" : "ADDRESS",
    "eChartsType" : "line",
    "index" : 0,
    "name" : "line_0",
@@ -161,7 +153,7 @@
        "id" : "0"
      },
      "type" : "XY",
-      "x" : [ "NAME" ],
+      "x" : [ "ADDRESS" ],
      "y" : [ "AGE" ],
      "id" : "0"
    },

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0301959097ChartView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0301959097ChartView.json
@@ -275,11 +275,7 @@
      "name" : "line_0-DEFAULT",
      "getPSChartDataSetFields" : [ {
        "index" : 0,
-        "name" : "NAME",
-        "getPSCodeList" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-        },
+        "name" : "ADDRESS",
        "groupField" : true,
        "id" : "0"
      }, {
@@ -413,11 +409,7 @@
    },
    "getPSDEChartSerieses" : [ {
      "caption" : "学生年龄信息",
-      "catalogField" : "NAME",
-      "getCatalogPSCodeList" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-      },
+      "catalogField" : "ADDRESS",
      "eChartsType" : "line",
      "index" : 0,
      "name" : "line_0",
@@ -446,7 +438,7 @@
          "id" : "0"
        },
        "type" : "XY",
-        "x" : [ "NAME" ],
+        "x" : [ "ADDRESS" ],
        "y" : [ "AGE" ],
        "id" : "0"
      },

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2ChartExpView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2ChartExpView.json
@@ -130,11 +130,7 @@
        "name" : "line_0-DEFAULT",
        "getPSChartDataSetFields" : [ {
          "index" : 0,
-          "name" : "NAME",
-          "getPSCodeList" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-          },
+          "name" : "ADDRESS",
          "groupField" : true,
          "id" : "0"
        }, {
@@ -277,11 +273,7 @@
      },
      "getPSDEChartSerieses" : [ {
        "caption" : "学生年龄信息",
-        "catalogField" : "NAME",
-        "getCatalogPSCodeList" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-        },
+        "catalogField" : "ADDRESS",
        "eChartsType" : "line",
        "index" : 0,
        "name" : "line_0",
@@ -310,7 +302,7 @@
            "id" : "0"
          },
          "type" : "XY",
-          "x" : [ "NAME" ],
+          "x" : [ "ADDRESS" ],
          "y" : [ "AGE" ],
          "id" : "0"
        },

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -11303,16 +11303,16 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    }, {
      "name" : "消息类型-常规信息",
@@ -11335,22 +11335,16 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg7"
-      }
-    }, {
      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -11358,21 +11352,21 @@
        "modelref" : true,
        "id" : "ViewMsg9"
      }
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg13"
      }
    }, {
      "name" : "消息位置-视图下方",
@@ -11381,23 +11375,17 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
-    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
    }, {
@@ -11413,21 +11401,33 @@
        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
+    }, {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    }, {
      "name" : "关闭模式-无删除",
@@ -11440,16 +11440,16 @@
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    } ]
  } ],