Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/assets/js/asyncRouter.js

.env

@@ -2,4 +2,6 @@ VITE_BASE_URL=http://192.168.0.17:8001/
 VITE_PROXY=/api/
 VITE_FILE_URL=https://file.zcloudchina.com/YTHFile
 VITE_TEMPLATE_URL=https://qaaq.qhdsafety.com/file/
+VITE_ON_LINE_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/zxwebsocket/
+VITE_LEARNING_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/websocket/
 

.eslintrc.cjs

@@ -31,5 +31,6 @@ module.exports = {
     BMapGL: "readonly",
     JSEncrypt: "readonly",
     Aliplayer: "readonly",
+    AliyunUpload: "readonly",
   }
 };

index.html

@@ -17,5 +17,8 @@
     <script type="module" src="/src/main.js"></script>
     <link rel="stylesheet" href="https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/skins/default/aliplayer-min.css" />
     <script charset="utf-8" type="text/javascript" src="https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/aliplayer-min.js"></script>
+    <script src="/aliyun-upload-sdk-1.5.6/lib/es6-promise.min.js"></script>
+    <script src="/aliyun-upload-sdk-1.5.6/lib/aliyun-oss-sdk-6.17.1.min.js"></script>
+    <script src="/aliyun-upload-sdk-1.5.6/aliyun-upload-sdk-1.5.6.min.js"></script>
   </body>
 </html>

package.json

@@ -15,13 +15,16 @@
     "@vueuse/core": "^9.13.0",
     "@vueuse/integrations": "^10.7.1",
     "animate.css": "^4.1.1",
+    "autofit.js": "^3.0.7",
     "axios": "^1.6.3",
     "dayjs": "^1.11.10",
+    "echarts": "^5.4.3",
     "element-plus": "^2.4.4",
     "html2canvas": "^1.4.1",
     "jspdf": "^2.5.1",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
+    "nanoid": "^5.0.4",
     "normalize.css": "^8.0.1",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
@@ -31,7 +34,9 @@
     "throttle-debounce": "^5.0.0",
     "v-viewer": "^3.0.11",
     "vue": "^3.4.3",
+    "vue-countup-v3": "^1.4.1",
     "vue-draggable-plus": "^0.3.4",
+    "vue-esign": "^1.1.4",
     "vue-router": "^4.2.5",
     "vue3-pdfjs": "^0.1.6",
     "vue3-print-nb": "^0.1.4",

src/assets/css/element.scss

@@ -89,9 +89,8 @@
 
 .el-menu-item {
   &:hover, &.is-active {
-    background-image: url("/src/assets/images/public/list_on.png");
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
+    //background: #1d3f77;
+    background-image: linear-gradient(to right, #1e499a, rgba(0,0,0,0));
   }
 }
 
@@ -122,6 +121,10 @@
   width: 100% !important;
 }
 
+.el-textarea.is-disabled .el-textarea__inner {
+  --el-disabled-border-color: var(--el-border-color);
+}
+
 .el-table {
   --el-table-bg-color: #071a43 !important;
   --el-bg-color: #071a43 !important;
@@ -149,6 +152,14 @@
   --el-pagination-bg-color: var(--el-fill-color-blank) !important;
 }
 
+.el-pagination .el-select {
+  width: 128px !important;
+}
+
+.el-pagination--small .el-select {
+  width: 100px !important;
+}
+
 .el-radio {
   --el-radio-input-bg-color: #091839 !important;
 }
@@ -188,7 +199,7 @@
   --el-checkbox-disabled-border-color: var(--el-border-color);
 }
 
-.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
+.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner, .el-checkbox__input.is-disabled.is-indeterminate .el-checkbox__inner {
   --el-checkbox-disabled-checked-input-fill: var(--el-checkbox-bg-color);
   --el-checkbox-disabled-checked-input-border-color: var(--el-color-check);
 }

src/assets/js/asyncRouter.js

@@ -629,6 +629,128 @@ export default [
             path: "",
             component: "statistical_analysis/inventory_statistics_month/index",
           },
+          {
+            path: "/statistical_analysis/inventory_statistics_month/print",
+            meta: {
+              title: "打印",
+              activeMenu: "/statistical_analysis/inventory_statistics_month",
+            },
+            component: "statistical_analysis/inventory_statistics_month/print",
+          },
+        ],
+      },
+    ],
+  },
+  {
+    path: "/performance_appraisal",
+    redirect: "/performance_appraisal/departmental",
+    meta: { title: "绩效考核", model: MODEL["1"] },
+    component: "children",
+    children: [
+      {
+        path: "/performance_appraisal/departmental",
+        meta: { title: "部门绩效", isSubMenu: false },
+        component: "performance_appraisal/departmental/index",
+      },
+      {
+        path: "/performance_appraisal/personnel",
+        meta: { title: "人员绩效", isSubMenu: false },
+        component: "performance_appraisal/personnel/index",
+      },
+    ],
+  },
+  {
+    path: "/workforce_management",
+    meta: { title: "排班管理", model: MODEL["1"], isSubMenu: false },
+    component: "workforce_management/index",
+  },
+  {
+    path: "/off_duty_management",
+    redirect: "/off_duty_management/leave",
+    meta: { title: "离岗管理", model: MODEL["1"] },
+    component: "children",
+    children: [
+      {
+        path: "/off_duty_management/leave",
+        meta: { title: "离岗管理", isSubMenu: false },
+        component: "off_duty_management/leave/index",
+      },
+      {
+        path: "/off_duty_management/login_record",
+        meta: { title: "登录记录", isSubMenu: false },
+        component: "off_duty_management/login_record/index",
+      },
+    ],
+  },
+  {
+    path: "/risk_statement",
+    redirect: "/risk_statement/risk_four_color_chart",
+    meta: { title: "风险提示", model: MODEL["1"] },
+    component: "children",
+    children: [
+      {
+        path: "/risk_statement/risk_four_color_chart",
+        meta: { title: "风险四色图", isSubMenu: false },
+        component: "risk_statement/risk_four_color_chart/index",
+      },
+      {
+        path: "/risk_statement/risk_notification_card",
+        meta: { title: "风险告知卡", isSubMenu: false },
+        component: "risk_statement/risk_notification_card/index",
+      },
+      {
+        path: "/risk_statement/job_notification_card",
+        meta: { title: "岗位告知卡", isSubMenu: false },
+        component: "risk_statement/job_notification_card/index",
+      },
+      {
+        path: "/risk_statement/safety_production_commitment_card",
+        meta: { title: "安全生产承诺卡", isSubMenu: false },
+        component: "risk_statement/safety_production_commitment_card/index",
+      },
+      {
+        path: "/risk_statement/emergency_response_card",
+        meta: { title: "应急处置卡", isSubMenu: false },
+        component: "risk_statement/emergency_response_card/index",
+      },
+    ],
+  },
+  {
+    path: "/dynamic_evaluation",
+    redirect: "/dynamic_evaluation/risk_control_menu",
+    meta: { title: "动态评估", model: MODEL["1"] },
+    component: "children",
+    children: [
+      {
+        path: "/dynamic_evaluation/risk_control_menu",
+        meta: { title: "风险管控动态评估菜单", isSubMenu: false },
+        component: "children",
+        children: [
+          { path: "", component: "dynamic_evaluation/risk_control_menu/index" },
+          {
+            path: "/dynamic_evaluation/risk_control_menu/add",
+            meta: {
+              title: "新增",
+              activeMenu: "/dynamic_evaluation/risk_control_menu",
+            },
+            component: "dynamic_evaluation/risk_control_menu/add",
+          },
+          {
+            path: "/dynamic_evaluation/risk_control_menu/view",
+            meta: {
+              title: "查看",
+              activeMenu: "/dynamic_evaluation/risk_control_menu",
+            },
+            component: "dynamic_evaluation/risk_control_menu/add",
+          },
+          {
+            path: "/dynamic_evaluation/risk_control_menu/edit",
+            meta: {
+              title: "编辑",
+              activeMenu: "/dynamic_evaluation/risk_control_menu",
+            },
+            component: "dynamic_evaluation/risk_control_menu/add",
+          },
         ],
       },
     ],
@@ -652,7 +774,7 @@ export default [
             children: [
               {
                 path: "",
-                component: "platform_resource_library/courseware/video",
+                component: "platform_resource_library/courseware/video/index",
               },
               {
                 path: "/platform_resource_library/courseware/video/view",
@@ -660,7 +782,7 @@ export default [
                   title: "课件习题",
                   activeMenu: "/platform_resource_library/courseware/video",
                 },
-                component: "platform_resource_library/courseware/view",
+                component: "platform_resource_library/courseware/video/view",
               },
             ],
           },
@@ -671,7 +793,7 @@ export default [
             children: [
               {
                 path: "",
-                component: "platform_resource_library/courseware/data",
+                component: "platform_resource_library/courseware/data/index",
               },
               {
                 path: "/platform_resource_library/courseware/data/view",
@@ -679,45 +801,45 @@ export default [
                   title: "课件习题",
                   activeMenu: "/platform_resource_library/courseware/data",
                 },
-                component: "platform_resource_library/courseware/view",
+                component: "platform_resource_library/courseware/data/view",
               },
             ],
           },
         ],
       },
       {
-        path: "/platform_resource_library/curriculum/list",
+        path: "/platform_resource_library/curriculum",
         meta: { title: "课程管理", isSubMenu: false },
         component: "children",
         children: [
           {
             path: "",
-            component: "platform_resource_library/curriculum/list",
+            component: "platform_resource_library/curriculum/index",
           },
           {
             path: "/platform_resource_library/curriculum/view",
             meta: {
-              title: "查看详情",
-              activeMenu: "/platform_resource_library/curriculum/list",
+              title: "查看",
+              activeMenu: "/platform_resource_library/curriculum",
             },
             component: "platform_resource_library/curriculum/view",
           },
         ],
       },
       {
-        path: "/platform_resource_library/paper/list",
+        path: "/platform_resource_library/paper",
         meta: { title: "试卷管理", isSubMenu: false },
         component: "children",
         children: [
           {
             path: "",
-            component: "platform_resource_library/paper/list",
+            component: "platform_resource_library/paper/index",
           },
           {
             path: "/platform_resource_library/paper/view",
             meta: {
-              title: "查看试卷",
-              activeMenu: "/platform_resource_library/paper/list",
+              title: "查看",
+              activeMenu: "/platform_resource_library/paper",
             },
             component: "platform_resource_library/paper/view",
           },
@@ -747,13 +869,28 @@ export default [
                 component: "online_learn_exam/courseware/video/index",
               },
               {
-                path: "/online_learn_exam/courseware/video/question_list",
+                path: "/online_learn_exam/courseware/video/add",
+                meta: {
+                  title: "添加",
+                  activeMenu: "/online_learn_exam/courseware/video",
+                },
+                component: "online_learn_exam/courseware/video/add",
+              },
+              {
+                path: "/online_learn_exam/courseware/video/edit",
+                meta: {
+                  title: "修改",
+                  activeMenu: "/online_learn_exam/courseware/video",
+                },
+                component: "online_learn_exam/courseware/video/add",
+              },
+              {
+                path: "/online_learn_exam/courseware/video/exercises",
                 meta: {
                   title: "课件习题",
                   activeMenu: "/online_learn_exam/courseware/video",
                 },
-                component:
-                  "online_learn_exam/courseware/question/question_list",
+                component: "online_learn_exam/courseware/video/exercises",
               },
             ],
           },
@@ -767,76 +904,299 @@ export default [
                 component: "online_learn_exam/courseware/data/index",
               },
               {
-                path: "/online_learn_exam/courseware/data/question_list",
+                path: "/online_learn_exam/courseware/data/add",
                 meta: {
-                  title: "课件习题",
+                  title: "新增",
                   activeMenu: "/online_learn_exam/courseware/data",
                 },
-                component:
-                  "online_learn_exam/courseware/question/question_list",
+                component: "online_learn_exam/courseware/data/add",
               },
-            ],
+              {
+                path: "/online_learn_exam/courseware/data/edit",
+                meta: {
+                  title: "修改",
+                  activeMenu: "/online_learn_exam/courseware/data",
+                },
+                component: "online_learn_exam/courseware/data/add",
+              },
+              {
+                path: "/online_learn_exam/courseware/data/exercises",
+                meta: {
+                  title: "课件习题",
+                  activeMenu: "/online_learn_exam/courseware/video",
+                },
+                component: "online_learn_exam/courseware/data/exercises",
               },
             ],
           },
         ],
       },
       {
-    path: "/archives",
-    redirect: "/archives/user",
+        path: "/online_learn_exam/curriculum",
+        meta: { title: "课程管理", isSubMenu: false },
+        component: "children",
+        children: [
+          {
+            path: "/online_learn_exam/curriculum",
+            component: "online_learn_exam/curriculum/index",
+          },
+          {
+            path: "/online_learn_exam/curriculum/view",
+            meta: {
+              title: "查看",
+              activeMenu: "/online_learn_exam/curriculum",
+            },
+            component: "online_learn_exam/curriculum/view",
+          },
+          {
+            path: "/online_learn_exam/curriculum/add",
+            meta: {
+              title: "新增",
+              activeMenu: "/online_learn_exam/curriculum",
+            },
+            component: "online_learn_exam/curriculum/add",
+          },
+          {
+            path: "/online_learn_exam/curriculum/edit",
+            meta: {
+              title: "修改",
+              activeMenu: "/online_learn_exam/curriculum",
+            },
+            component: "online_learn_exam/curriculum/add",
+          },
+          {
+            path: "/online_learn_exam/curriculum/inherit",
+            meta: {
+              title: "继承",
+              activeMenu: "/online_learn_exam/curriculum",
+            },
+            component: "online_learn_exam/curriculum/add",
+          },
+        ],
+      },
+      {
+        path: "/online_learn_exam/paper",
+        meta: { title: "试卷管理", isSubMenu: false },
+        component: "children",
+        children: [
+          {
+            path: "/online_learn_exam/paper",
+            component: "online_learn_exam/paper/index",
+          },
+          {
+            path: "/online_learn_exam/paper/view",
+            meta: {
+              title: "查看",
+              activeMenu: "/online_learn_exam/paper",
+            },
+            component: "online_learn_exam/paper/view",
+          },
+          {
+            path: "/online_learn_exam/paper/add",
+            meta: {
+              title: "新增",
+              activeMenu: "/online_learn_exam/paper",
+            },
+            component: "online_learn_exam/paper/add",
+          },
+        ],
+      },
+      {
+        path: "/online_learn_exam/task",
+        meta: { title: "任务管理", isSubMenu: false },
+        component: "children",
+        children: [
+          {
+            path: "",
+            component: "online_learn_exam/task/index",
+          },
+          {
+            path: "/online_learn_exam/task/view",
+            meta: {
+              title: "查看",
+              activeMenu: "/online_learn_exam/task",
+            },
+            component: "online_learn_exam/task/view",
+          },
+          {
+            path: "/online_learn_exam/task/update",
+            meta: {
+              title: "修改",
+              activeMenu: "/online_learn_exam/task",
+            },
+            component: "online_learn_exam/task/view",
+          },
+          {
+            path: "/online_learn_exam/task/add",
+            meta: {
+              title: "新增",
+              activeMenu: "/online_learn_exam/task",
+            },
+            component: "online_learn_exam/task/add",
+          },
+          {
+            path: "/online_learn_exam/task/student_details",
+            meta: {
+              title: "学员详情",
+              activeMenu: "/online_learn_exam/task",
+            },
+            component: "children",
+            children: [
+              {
+                path: "",
+                component: "online_learn_exam/task/student_details",
+              },
+              {
+                path: "/online_learn_exam/task/student_details/learning_details",
+                meta: {
+                  title: "学习详情",
+                  activeMenu: "/online_learn_exam/task",
+                },
+                component: "online_learn_exam/task/learning_details",
+              },
+            ],
+          },
+          {
+            path: "/online_learn_exam/task/exam_details",
+            meta: {
+              title: "考试详情",
+              activeMenu: "/online_learn_exam/task",
+            },
+            component: "children",
+            children: [
+              {
+                path: "",
+                component: "online_learn_exam/task/exam_details",
+              },
+              {
+                path: "/online_learn_exam/task/exam_details/exam_paper_details",
+                meta: {
+                  title: "考卷详情",
+                  activeMenu: "/online_learn_exam/task",
+                },
+                component: "online_learn_exam/task/exam_paper_details",
+              },
+            ],
+          },
+        ],
+      },
+      {
+        path: "/online_learn_exam/my_task",
+        meta: { title: "我的任务", isSubMenu: false },
+        component: "children",
+        children: [
+          {
+            path: "",
+            component: "online_learn_exam/my_task/index",
+          },
+          {
+            path: "/online_learn_exam/my_task/start_learning",
+            meta: {
+              title: "开始学习",
+              activeMenu: "/online_learn_exam/my_task",
+            },
+            component: "children",
+            children: [
+              {
+                path: "",
+                component: "online_learn_exam/my_task/start_learning",
+              },
+              {
+                path: "/online_learn_exam/my_task/start_learning/learning_video",
+                meta: {
+                  title: "学习",
+                  activeMenu: "/online_learn_exam/my_task",
+                },
+                component: "online_learn_exam/my_task/learning_video",
+              },
+              {
+                path: "/online_learn_exam/my_task/start_learning/learning_pdf",
+                meta: {
+                  title: "学习",
+                  activeMenu: "/online_learn_exam/my_task",
+                },
+                component: "online_learn_exam/my_task/learning_pdf",
+              },
+            ],
+          },
+          {
+            path: "/online_learn_exam/my_task/task_exam",
+            meta: {
+              title: "任务考试",
+              activeMenu: "/online_learn_exam/my_task",
+            },
+            component: "online_learn_exam/my_task/task_exam",
+          },
+          {
+            path: "/online_learn_exam/my_task/exam_details",
+            meta: {
+              title: "考试详情",
+              activeMenu: "/online_learn_exam/my_task",
+            },
+            component: "online_learn_exam/my_task/exam_details",
+          },
+        ],
+      },
+    ],
+  },
+  {
+    path: "/signature_information_management",
+    meta: { title: "签字信息管理", model: MODEL["2"], isSubMenu: false },
+    component: "signature_information_management/index",
+  },
+  {
+    path: "/file_management",
+    redirect: "/file_management/personnel",
     meta: { title: "档案管理", model: MODEL["2"] },
     component: "children",
     children: [
       {
-        path: "/archives/user",
+        path: "/file_management/personnel",
         meta: { title: "一人一档", isSubMenu: false },
         component: "children",
         children: [
+          { path: "", component: "file_management/personnel/index" },
           {
-            path: "",
-            component: "archives/user/index",
-          },
-          {
-            path: "/archives/user/task_list",
+            path: "/file_management/personnel/task_details",
             meta: {
               title: "任务详情",
-              activeMenu: "/archives/user",
-            },
-            component: "archives/user/task_list",
+              activeMenu: "/file_management/personnel",
             },
+            component: "children",
+            children: [
+              { path: "", component: "file_management/personnel/task_details" },
               {
-            path: "/archives/user/detail",
+                path: "/file_management/personnel/task_details/file_details",
                 meta: {
-              title: "任务详情",
-              activeMenu: "/archives/user",
+                  title: "档案详情",
+                  activeMenu: "/file_management/personnel",
                 },
-            component: "archives/user/detail",
+                component: "file_management/personnel/file_details",
+              },
+            ],
           },
         ],
       },
       {
-        path: "/archives/semester",
+        path: "/file_management/stage",
         meta: { title: "一期一档", isSubMenu: false },
         component: "children",
         children: [
+          { path: "", component: "file_management/stage/index" },
           {
-            path: "",
-            component: "archives/semester/index",
-          },
-          {
-            path: "/archives/semester/catalogue",
+            path: "/file_management/stage/archival_catalogue",
             meta: {
               title: "档案目录",
-              activeMenu: "/archives/semester",
+              activeMenu: "/file_management/stage",
             },
-            component: "archives/corp/catalogue",
+            component: "file_management/stage/archival_catalogue",
           },
         ],
       },
       {
-        path: "/archives/corp",
+        path: "/file_management/enterprise",
         meta: { title: "一企一档", isSubMenu: false },
-        component: "archives/corp/index",
+        component: "file_management/enterprise/index",
       },
     ],
   },
@@ -1229,6 +1589,99 @@ export default [
       },
     ],
   },
+  {
+    path: "/package_protect_person",
+    redirect: "/package_protect_person/performance_statistics",
+    meta: { title: "企业安全包保责任人", model: MODEL["4"] },
+    component: "children",
+    children: [
+      {
+        path: "/package_protect_person/performance_statistics",
+        meta: { title: "履职统计", isSubMenu: false },
+        component: "package_protect_person/performance_statistics/index",
+      },
+    ],
+  },
+  {
+    path: "/safety_commitment",
+    redirect: "/safety_commitment/company_level",
+    meta: { title: "安全承诺", model: MODEL["4"] },
+    component: "children",
+    children: [
+      {
+        path: "/safety_commitment/company_level",
+        meta: { title: "公司级承诺公告", isSubMenu: false },
+        component: "children",
+        children: [
+          { path: "", component: "safety_commitment/company_level/index" },
+          {
+            path: "/safety_commitment/company_level/add",
+            meta: {
+              title: "补录",
+              activeMenu: "/safety_commitment/company_level",
+            },
+            component: "safety_commitment/company_level/add",
+          },
+          {
+            path: "/safety_commitment/company_level/view",
+            meta: {
+              title: "查看",
+              activeMenu: "/safety_commitment/company_level",
+            },
+            component: "safety_commitment/company_level/view",
+          },
+        ],
+      },
+      {
+        path: "/safety_commitment/workshop_level",
+        meta: { title: "车间级承诺公告", isSubMenu: false },
+        component: "children",
+        children: [
+          { path: "", component: "safety_commitment/workshop_level/index" },
+          {
+            path: "/safety_commitment/workshop_level/add",
+            meta: {
+              title: "补录",
+              activeMenu: "/safety_commitment/workshop_level",
+            },
+            component: "safety_commitment/workshop_level/add",
+          },
+          {
+            path: "/safety_commitment/workshop_level/view",
+            meta: {
+              title: "查看",
+              activeMenu: "/safety_commitment/workshop_level",
+            },
+            component: "safety_commitment/workshop_level/view",
+          },
+        ],
+      },
+      {
+        path: "/safety_commitment/team_level",
+        meta: { title: "班组级承诺公告", isSubMenu: false },
+        component: "children",
+        children: [
+          { path: "", component: "safety_commitment/team_level/index" },
+          {
+            path: "/safety_commitment/team_level/add",
+            meta: {
+              title: "补录",
+              activeMenu: "/safety_commitment/team_level",
+            },
+            component: "safety_commitment/team_level/add",
+          },
+          {
+            path: "/safety_commitment/team_level/view",
+            meta: {
+              title: "查看",
+              activeMenu: "/safety_commitment/team_level",
+            },
+            component: "safety_commitment/team_level/view",
+          },
+        ],
+      },
+    ],
+  },
   {
     path: "/video_manager",
     redirect: "/video_manager/video_manager",

src/assets/js/data_dictionary.js

@@ -55,6 +55,13 @@ export const layoutFnGetTrainingPlateType = async () => {
   });
   return ref(JSON.parse(resData.zTreeNodes));
 };
+// 大纲类型
+export const layoutFnGetOutlineType = async () => {
+  const resData = await getLevels({
+    DICTIONARIES_ID: "3c0d9b5e74834adfacb76139e5d731e5",
+  });
+  return ref(resData.list);
+};
 // 管控措施分类1
 export const layoutFnGetControlMeasures1 = async () => {
   const resData = await getLevelsByParentId({