Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

# Conflicts:
#	frontend/src/api/system/dictData.ts
#	frontend/src/views/authority/role/components/rolePopup.vue

frontend/src/api/system/dictData.ts

@@ -45,22 +45,27 @@ const dictData: Dict[] = [
   },
   {
     id: "3",
-    code: 'type',
+    code: 'resourceType',
     label: '资源类型',
     children: [
       {
-        id: "1",
+        id: "0",
         label: '菜单',
+        code: 0,
+      },
+      {
+        id: "1",
+        label: '按钮',
         code: 1,
       },
       {
         id: "2",
-        label: '按钮',
+        label: '公共资源',
         code: 2,
       },
       {
         id: "3",
-        label: '公共资源',
+        label: '服务间调用资源',
         code: 3,
       },
     ],
@@ -89,6 +94,85 @@ const dictData: Dict[] = [
   },
   {
     id: "5",
+    code: 'planTestState',
+    label: '检测状态',
+    children: [
+      {
+        id: "0",
+        label: '未检',
+        code: '未检',
+      },
+      {
+        id: "1",
+        label: '检测中',
+        code: '检测中',
+      },
+      {
+        id: "2",
+        label: '检测完成',
+        code: '检测完成',
+      },
+    ],
+  },
+  {
+    id: "6",
+    code: 'errorLevel',
+    label: '适用设备等级',
+    children: [
+      {
+        id: "0",
+        label: 'A级',
+        code: "A级",
+      },
+      {
+        id: "1",
+        label: 'S级',
+        code: 'S级',
+      },
+    ],
+  },
+  {
+    id: "7",
+    code: 'planReportState',
+    label: '报告生成状态',
+    children: [
+      {
+        id: "0",
+        label: '未生成',
+        code: "未生成",
+      },
+      {
+        id: "1",
+        label: '部分生成',
+        code: '部分生成',
+      },
+      {
+        id: "2",
+        label: '全部生成',
+        code: '全部生成',
+      },
+    ],
+  },
+  {
+    id: "8",
+    code: 'planResult',
+    label: '检测结果',
+    children: [
+      {
+        id: "0",
+        label: '符合',
+        code: "符合",
+      },
+      {
+        id: "1",
+        label: '不符合',
+        code: '不符合',
+      },
+    ],
+  },
+  
+  {
+    id: "9",
     code: 'testScriptValueType',
     label: '检测脚本值类型',
     children: [
@@ -105,7 +189,7 @@ const dictData: Dict[] = [
     ],
   },
   {
-    id: "6",
+    id: "10",
     code: 'testScriptType',
     label: '检测脚本模板类型',
     children: [
@@ -122,7 +206,7 @@ const dictData: Dict[] = [
     ],
   },
   {
-    id: "7",
+    id: "11",
     code: 'testSourceDevType',
     label: '检测源设备类型',
     children: [
@@ -154,7 +238,7 @@ const dictData: Dict[] = [
     ],
   },
   {
-    id: "8",
+    id: "12",
     code: 'testSourceType',
     label: '检测源类型',
     children: [
@@ -172,4 +256,5 @@ const dictData: Dict[] = [
   },
 ]
 
+
 export default dictData