Merge branch 'jzl'

danger-manage-web/src/api/contractTrain/contractTrain.js

+/*
+ * @Author: 纪泽龙 jizelong@qq.com
+ * @Date: 2022-12-27 16:04:04
+ * @LastEditors: 纪泽龙 jizelong@qq.com
+ * @LastEditTime: 2023-01-31 16:22:00
+ * @FilePath: /danger-manage-web/src/api/contractTrain/contractTrain.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import request from '@/utils/request'
 
 // 查询承包商及访客培训列表
@@ -9,6 +17,7 @@ export function listCourse(query) {
   })
 }
 
+
 // 查询承包商及访客培训详细
 export function getCourse(contractorCourseId) {
   return request({

danger-manage-web/src/utils/cesium/dangerArr.js

@@ -7,7 +7,7 @@
 //       [114.07708709377842, 38.248960473114614],
 //     ],
 //     colorNum: 1,
-//     fxlb: "高风险区域",
+//     fxlb: "重大风险区域",
 //     bsjh: "",
 //     wxy: "锅炉操作",
 //     fxd: "锅炉点火",
@@ -145,7 +145,7 @@ export const dangerArr = [
       [114.08164030994841, 38.25079994477491],
     ],
     data: {
-      fxlb: "较高风险"
+      fxlb: "较大风险"
     },
     colorNum: 2,
   },
@@ -160,7 +160,7 @@ export const dangerArr = [
       [114.08037480953207, 38.249932590119556],
     ],
     data: {
-      fxlb: "高风险",
+      fxlb: "重大风险",
       src: [jzyh, jzdhz, dxzd, dxxl, dxbz, bxdfdmj],
     },
     colorNum: 1,
@@ -174,7 +174,7 @@ export const dangerArr = [
       [114.08098376391818, 38.24951885572243],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -201,7 +201,7 @@ export const dangerArr = [
       [114.08000932886821, 38.25149427805925],
     ],
     data: {
-      fxlb: "较高风险"
+      fxlb: "较大风险"
     },
     colorNum: 2,
   },
@@ -215,7 +215,7 @@ export const dangerArr = [
       [114.07992247747968, 38.2490596822873],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
   },
   {
@@ -240,7 +240,7 @@ export const dangerArr = [
       [114.07896214915758, 38.2485657203445],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -253,7 +253,7 @@ export const dangerArr = [
       [114.07968503158452, 38.249621022521914],
     ],
     data: {
-      fxlb: "较高风险"
+      fxlb: "较大风险"
     },
     colorNum: 2,
   },
@@ -266,7 +266,7 @@ export const dangerArr = [
       [114.07932854865001, 38.25049906057526],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -279,7 +279,7 @@ export const dangerArr = [
       [114.07929156270377, 38.24989004286162],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -293,7 +293,7 @@ export const dangerArr = [
       [114.07818775308438, 38.24904718615451],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
   },
   {
@@ -308,7 +308,7 @@ export const dangerArr = [
       [114.07822516569071, 38.24873709204756],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
   },
   {
@@ -320,7 +320,7 @@ export const dangerArr = [
       [114.0778791617466, 38.24978811628299],
     ],
     data: {
-      fxlb: "较高风险"
+      fxlb: "较大风险"
     },
     colorNum: 2,
   },
@@ -334,7 +334,7 @@ export const dangerArr = [
       [114.07811902680491, 38.25084109067064],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
   },
   {
@@ -346,7 +346,7 @@ export const dangerArr = [
       [114.07816939918499, 38.250464604821424],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -362,7 +362,7 @@ export const dangerArr = [
       [114.07655032796976, 38.24855692071795],
     ],
     data: {
-      fxlb: "较高风险"
+      fxlb: "较大风险"
     },
   },
   {
@@ -375,7 +375,7 @@ export const dangerArr = [
       [114.07645852296761, 38.249258052783055],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
   },
   {
@@ -387,7 +387,7 @@ export const dangerArr = [
       [114.07673177371679, 38.24999869046041],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -400,7 +400,7 @@ export const dangerArr = [
       [114.07638572203807, 38.250006593486276],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -413,7 +413,7 @@ export const dangerArr = [
       [114.0763611632972, 38.2506105391965],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -440,7 +440,7 @@ export const dangerArr = [
       [114.07610863025666, 38.249559594773935],
     ],
     data: {
-      fxlb: "较高风险"
+      fxlb: "较大风险"
     },
   },
   {
@@ -452,7 +452,7 @@ export const dangerArr = [
       [114.07629629633044, 38.249994075703896],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -479,7 +479,7 @@ export const dangerArr = [
       [114.07614690640786, 38.250982027231906],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -492,7 +492,7 @@ export const dangerArr = [
       [114.07506815524074, 38.24935807751058],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -505,7 +505,7 @@ export const dangerArr = [
       [114.07575424777615, 38.25022009521355],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -518,7 +518,7 @@ export const dangerArr = [
       [114.07569321404614, 38.25050557141559],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -531,7 +531,7 @@ export const dangerArr = [
       [114.07533109169464, 38.25112532353275],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -544,7 +544,7 @@ export const dangerArr = [
       [114.07506400522227, 38.2498509809399],
     ],
     data: {
-      fxlb: "较高风险"
+      fxlb: "较大风险"
     },
     colorNum: 2,
   },
@@ -557,7 +557,7 @@ export const dangerArr = [
       [114.07507104315593, 38.249669088954406],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -571,7 +571,7 @@ export const dangerArr = [
       [114.07329016901807, 38.24975956466659],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
   },
   {
@@ -583,7 +583,7 @@ export const dangerArr = [
       [114.07449942174725, 38.25005976641145],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },
@@ -596,7 +596,7 @@ export const dangerArr = [
       [114.07409377782558, 38.25057015884229],
     ],
     data: {
-      fxlb: "高风险"
+      fxlb: "重大风险"
     },
     colorNum: 1,
   },