*）修改问题改为隐患

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/company.json

@@ -92,7 +92,7 @@
         { "key": "keyUnit", "label": "是否重点监控单位" }
       ],
       "infoRecords": {
-        "title": "问题记录",
+        "title": "隐患记录",
         "renderType": "timeline",
         "datas": []
       }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_1000.json

@@ -102,7 +102,7 @@
     },
     {
       "key": "devtable",
-      "displayName": "问题列表",
+      "displayName": "隐患列表",
       "renderType": "table",
       "useAloneApi": true,
       "dataConfig": {
@@ -119,15 +119,15 @@
       "visualParams": {
         "rowKey": "sequenceNbr",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
           {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
           {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"}
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
         ]
       }
     }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_2000.json

@@ -106,7 +106,7 @@
     },
     {
       "key": "devtable",
-      "displayName": "问题列表",
+      "displayName": "隐患列表",
       "renderType": "table",
       "useAloneApi": true,
       "dataConfig": {
@@ -123,15 +123,15 @@
       "visualParams": {
         "rowKey": "sequenceNbr",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
           {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
           {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"}
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
         ]
       }
     }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_3000.json

@@ -102,7 +102,7 @@
     },
     {
       "key": "devtable",
-      "displayName": "问题列表",
+      "displayName": "隐患列表",
       "renderType": "table",
       "useAloneApi": true,
       "dataConfig": {
@@ -119,15 +119,15 @@
       "visualParams": {
         "rowKey": "sequenceNbr",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
           {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
           {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"}
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
         ]
       }
     }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_4000.json

@@ -98,7 +98,7 @@
     },
     {
       "key": "devtable",
-      "displayName": "问题列表",
+      "displayName": "隐患列表",
       "renderType": "table",
       "useAloneApi": true,
       "dataConfig": {
@@ -115,15 +115,15 @@
       "visualParams": {
         "rowKey": "sequenceNbr",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
           {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
           {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"}
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
         ]
       }
     }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_5000.json

@@ -94,7 +94,7 @@
     },
     {
       "key": "devtable",
-      "displayName": "问题列表",
+      "displayName": "隐患列表",
       "renderType": "table",
       "useAloneApi": true,
       "dataConfig": {
@@ -111,15 +111,15 @@
       "visualParams": {
         "rowKey": "sequenceNbr",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
           {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
           {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"}
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
         ]
       }
     }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_6000.json

@@ -88,7 +88,7 @@
     },
     {
       "key": "devtable",
-      "displayName": "问题列表",
+      "displayName": "隐患列表",
       "renderType": "table",
       "useAloneApi": true,
       "dataConfig": {
@@ -105,15 +105,15 @@
       "visualParams": {
         "rowKey": "sequenceNbr",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
           {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
           {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"}
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
         ]
       }
     }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_8000.json

@@ -94,7 +94,7 @@
     },
     {
       "key": "devtable",
-      "displayName": "问题列表",
+      "displayName": "隐患列表",
       "renderType": "table",
       "useAloneApi": true,
       "dataConfig": {
@@ -111,15 +111,15 @@
       "visualParams": {
         "rowKey": "sequenceNbr",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
           {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
           {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"}
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
         ]
       }
     }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_9000.json

@@ -94,7 +94,7 @@
     },
     {
       "key": "devtable",
-      "displayName": "问题列表",
+      "displayName": "隐患列表",
       "renderType": "table",
       "useAloneApi": true,
       "dataConfig": {
@@ -111,15 +111,15 @@
       "visualParams": {
         "rowKey": "sequenceNbr",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
           {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
           {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
           {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"}
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
         ]
       }
     }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/problem.json

 {
-  "name": "问题模板",
+  "name": "隐患模板",
   "tabs": [
     {
       "key": "keyinfo",
@@ -77,16 +77,16 @@
   "content": {
     "keyinfo": {
       "keyParams": [
-        { "key": "sourceType", "label": "问题主体类型" },
-        { "key": "problemType", "label": "问题类型" },
-        { "key": "problemDesc", "label": "问题描述" },
-        { "key": "problemTime", "label": "问题时间" },
-        { "key": "problemLevel", "label": "问题等级", "value": "重大" },
+        { "key": "sourceType", "label": "隐患主体类型" },
+        { "key": "problemType", "label": "隐患类型" },
+        { "key": "problemDesc", "label": "隐患描述" },
+        { "key": "problemTime", "label": "隐患时间" },
+        { "key": "problemLevel", "label": "隐患等级", "value": "重大" },
         { "key": "principalUnit", "label": "主体单位" },
         { "key": "principalUnitType", "label": "单位类型" },
         { "key": "governingBody", "label": "管辖机构" },
         { "key": "governingBodyCode", "label": "所属区域" },
-        { "key": "problemStatus", "label": "问题状态" },
+        { "key": "problemStatus", "label": "隐患状态" },
         { "key": "equipSuperviseCode", "label": "监管吗" },
         { "key": "equipList", "label": "设备种类" }
       ]

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/problem_cylinder.json

 {
-  "name": "气瓶问题模板",
+  "name": "气瓶隐患模板",
   "tabs": [
     {
       "key": "keyinfo",
@@ -77,16 +77,16 @@
   "content": {
     "keyinfo": {
       "keyParams": [
-        { "key": "sourceType", "label": "问题主体类型" },
-        { "key": "problemType", "label": "问题类型" },
-        { "key": "problemDesc", "label": "问题描述" },
-        { "key": "problemTime", "label": "问题时间" },
-        { "key": "problemLevel", "label": "问题等级", "value": "重大" },
+        { "key": "sourceType", "label": "隐患主体类型" },
+        { "key": "problemType", "label": "隐患类型" },
+        { "key": "problemDesc", "label": "隐患描述" },
+        { "key": "problemTime", "label": "隐患时间" },
+        { "key": "problemLevel", "label": "隐患等级", "value": "重大" },
         { "key": "principalUnit", "label": "主体单位" },
         { "key": "principalUnitType", "label": "单位类型" },
         { "key": "governingBody", "label": "管辖机构" },
         { "key": "governingBodyCode", "label": "所属区域" },
-        { "key": "problemStatus", "label": "问题状态" },
+        { "key": "problemStatus", "label": "隐患状态" },
         { "key": "equipSuperviseCode", "label": "监管吗" },
         { "key": "equipList", "label": "设备种类" }
       ]