Merge remote-tracking branch 'origin/master'

danger-manage-admin/src/main/java/com/zehong/web/controller/contractTrain/TTrainCourseStatController.java

+package com.zehong.web.controller.contractTrain;
+
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.page.TableDataInfo;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.TContractorTrainCourseTopic;
+import com.zehong.system.domain.TrainCourseStat;
+import com.zehong.system.domain.TrainCourseStatDetail;
+import com.zehong.system.service.TTrainCourseStatService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author geng
+ * 培训统计
+ */
+@RestController
+@RequestMapping("/trainStat")
+public class TTrainCourseStatController extends BaseController {
+
+    @Autowired
+    private TTrainCourseStatService tTrainCourseStatService;
+
+    /**
+     * 获取培训统计查询
+     * @param trainCourseStat 统计查询参数
+     * @return
+     */
+    @GetMapping("/getTrainCourseStatData")
+    public TableDataInfo getTrainCourseStatData(TrainCourseStat trainCourseStat){
+        startPage();
+        List<TrainCourseStat> list = tTrainCourseStatService.getTrainCourseStatData(trainCourseStat);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取培训统计详情
+     * @param courseId 培训id
+     * @return
+     */
+    @GetMapping("/getTrainCourseStatDetailData")
+    public TableDataInfo getTrainCourseStatDetailData(Long courseId){
+        startPage();
+        List<TrainCourseStatDetail> list = tTrainCourseStatService.getTrainCourseStatDetailData(courseId);
+        return getDataTable(list);
+    }
+
+
+    @GetMapping("/trainCourseStatDetailExport")
+    public AjaxResult trainCourseStatDetailExport(Long courseId) {
+        List<TrainCourseStatDetail> list = tTrainCourseStatService.getTrainCourseStatDetailData(courseId);
+        ExcelUtil<TrainCourseStatDetail> util = new ExcelUtil<>(TrainCourseStatDetail.class);
+        return util.exportExcel(list, "培训统计详情");
+    }
+}

danger-manage-admin/src/main/java/com/zehong/web/controller/train/TTrainCourseController.java

@@ -173,7 +173,7 @@ public class TTrainCourseController extends BaseController
      * @param statisticsTrainCourse 统计实体
      * @return TableDataInfo
      */
-    @GetMapping(value = "statisticsTrainCourse")
+    @GetMapping(value = "/statisticsTrainCourse")
     public TableDataInfo statisticsTrainCourse(StatisticsTrainCourse statisticsTrainCourse){
         startPage();
         List<StatisticsTrainCourse> statisticsTrainCourses = tTrainCourseService.statisticsTrainCourse(statisticsTrainCourse);

danger-manage-system/src/main/java/com/zehong/system/domain/TrainCourseStat.java

+package com.zehong.system.domain;
+
+import java.util.Date;
+
+public class TrainCourseStat {
+
+    private Long courseId;
+
+    private String courseName;
+
+    private Date releaseTime;
+
+    private String planName;
+
+    private String maybeTestNum;
+
+    private String finishNum;
+
+    private Date releaseBeginTime;
+
+    private Date releaseEndTime;
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public Date getReleaseTime() {
+        return releaseTime;
+    }
+
+    public void setReleaseTime(Date releaseTime) {
+        this.releaseTime = releaseTime;
+    }
+
+    public String getPlanName() {
+        return planName;
+    }
+
+    public void setPlanName(String planName) {
+        this.planName = planName;
+    }
+
+    public String getMaybeTestNum() {
+        return maybeTestNum;
+    }
+
+    public void setMaybeTestNum(String maybeTestNum) {
+        this.maybeTestNum = maybeTestNum;
+    }
+
+    public String getFinishNum() {
+        return finishNum;
+    }
+
+    public void setFinishNum(String finishNum) {
+        this.finishNum = finishNum;
+    }
+
+    public Date getReleaseBeginTime() {
+        return releaseBeginTime;
+    }
+
+    public void setReleaseBeginTime(Date releaseBeginTime) {
+        this.releaseBeginTime = releaseBeginTime;
+    }
+
+    public Date getReleaseEndTime() {
+        return releaseEndTime;
+    }
+
+    public void setReleaseEndTime(Date releaseEndTime) {
+        this.releaseEndTime = releaseEndTime;
+    }
+}

danger-manage-system/src/main/java/com/zehong/system/domain/TrainCourseStatDetail.java

+package com.zehong.system.domain;
+
+import com.zehong.common.annotation.Excel;
+
+public class TrainCourseStatDetail {
+
+    private Long userCourseId;
+
+    @Excel(name = "培训人员")
+    private String nickName;
+
+    @Excel(name = "所属部门")
+    private String deptName;
+
+    @Excel(name = "培训时长")
+    private String finishDuration;
+
+    private Integer trainState;
+
+    @Excel(name = "是否完成")
+    private String isComplete;
+
+    public Long getUserCourseId() {
+        return userCourseId;
+    }
+
+    public void setUserCourseId(Long userCourseId) {
+        this.userCourseId = userCourseId;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getFinishDuration() {
+        return finishDuration;
+    }
+
+    public void setFinishDuration(String finishDuration) {
+        this.finishDuration = finishDuration;
+    }
+
+    public Integer getTrainState() {
+        return trainState;
+    }
+
+    public void setTrainState(Integer trainState) {
+        this.trainState = trainState;
+    }
+
+    public String getIsComplete() {
+        return isComplete;
+    }
+
+    public void setIsComplete(String isComplete) {
+        this.isComplete = isComplete;
+    }
+}

danger-manage-system/src/main/java/com/zehong/system/mapper/TTrainCourseStatMapper.java

+package com.zehong.system.mapper;
+
+import com.zehong.system.domain.TrainCourseStat;
+import com.zehong.system.domain.TrainCourseStatDetail;
+
+import java.util.List;
+
+/**
+ * @author geng
+ * 培训课程统计
+ */
+public interface TTrainCourseStatMapper {
+
+    /**
+     * 获取培训统计查询
+     * @param trainCourseStat 统计查询参数
+     * @return
+     */
+    List<TrainCourseStat> getTrainCourseStatData(TrainCourseStat trainCourseStat);
+
+    /**
+     * 获取培训统计详情
+     * @param courseId 培训id
+     * @return
+     */
+    List<TrainCourseStatDetail> getTrainCourseStatDetailData(Long courseId);
+}

danger-manage-system/src/main/java/com/zehong/system/service/TTrainCourseStatService.java

+package com.zehong.system.service;
+
+import com.zehong.system.domain.TrainCourseStat;
+import com.zehong.system.domain.TrainCourseStatDetail;
+
+import java.util.List;
+
+/**
+ * @author geng
+ * 培训统计
+ */
+public interface TTrainCourseStatService {
+
+    /**
+     * 获取培训统计查询
+     * @param trainCourseStat 统计查询参数
+     * @return
+     */
+    List<TrainCourseStat> getTrainCourseStatData(TrainCourseStat trainCourseStat);
+
+    /**
+     * 获取培训统计详情
+     * @param courseId 培训id
+     * @return
+     */
+    List<TrainCourseStatDetail> getTrainCourseStatDetailData(Long courseId);
+}

danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseServiceImpl.java

@@ -163,6 +163,14 @@ public class TTrainCourseServiceImpl implements ITTrainCourseService
     @Override
     public int updateTTrainUserCourse(TTrainUserCourse tTrainUserCourse)
     {
+        //判断有没有考试
+        if(tTrainUserCourse.getTrainState()==1){
+            List<TTrainCourseTopic> topicList = tTrainCourseTopicMapper.selectCourseTopicList(tTrainUserCourse.getCourseId());
+            if(topicList.size()==0){
+                tTrainUserCourse.setState(2);
+            }
+        }
+
         return tTrainUserCourseMapper.updateTTrainUserCourse(tTrainUserCourse);
     }
 
@@ -199,7 +207,7 @@ public class TTrainCourseServiceImpl implements ITTrainCourseService
     public List<UserCourseVo> userCourseList(Long userId,Integer type){
         List<UserCourseVo> list = tTrainCourseMapper.userCourseList(userId,type,1);
         for (UserCourseVo v :list){
-            if(v.getTestEndTime()!=null&&v.getTestEndTime().getTime()<new Date().getTime()){
+            if(v.getTestEndTime()!=null&&v.getTestEndTime().getTime()<new Date().getTime()&&v.getState()!=2){
                 v.setState(3);
             }
             if(v.getTestStartTime()!=null&&v.getTestStartTime().getTime()>new Date().getTime()){
@@ -456,7 +464,7 @@ public class TTrainCourseServiceImpl implements ITTrainCourseService
     public TTrainUserCourse getUserCourse(Long userCourseId){
         TTrainUserCourse userCourse = tTrainUserCourseMapper.selectTTrainUserCourseById(userCourseId);
         TTrainCourse v = tTrainCourseMapper.selectTTrainCourseById(userCourse.getCourseId());
-        if(v.getTestEndTime()!=null&&v.getTestEndTime().getTime()<new Date().getTime()){
+        if(v.getTestEndTime()!=null&&v.getTestEndTime().getTime()<new Date().getTime()&&userCourse.getState()!=2){
             userCourse.setState(3);
         }
         return userCourse;

danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseStatServiceImpl.java

+package com.zehong.system.service.impl;
+
+import com.zehong.system.domain.TrainCourseStat;
+import com.zehong.system.domain.TrainCourseStatDetail;
+import com.zehong.system.mapper.TTrainCourseStatMapper;
+import com.zehong.system.service.TTrainCourseStatService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author geng
+ * 培训统计
+ */
+@Service
+public class TTrainCourseStatServiceImpl implements TTrainCourseStatService {
+
+    @Autowired
+    private TTrainCourseStatMapper tTrainCourseStatMapper;
+    /**
+     * 获取培训统计查询
+     * @param trainCourseStat 统计查询参数
+     * @return
+     */
+    @Override
+    public List<TrainCourseStat> getTrainCourseStatData(TrainCourseStat trainCourseStat){
+        return tTrainCourseStatMapper.getTrainCourseStatData(trainCourseStat);
+    }
+
+    /**
+     * 获取培训统计详情
+     * @param courseId 培训id
+     * @return
+     */
+    @Override
+    public List<TrainCourseStatDetail> getTrainCourseStatDetailData(Long courseId){
+        return tTrainCourseStatMapper.getTrainCourseStatDetailData(courseId);
+    }
+}

danger-manage-system/src/main/resources/mapper/system/TTrainCourseMapper.xml

@@ -218,7 +218,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t_train_course course
         INNER JOIN t_train_user_course user ON course.course_id = user.course_id
         <where>
-            course.status = '1' AND course.is_del = '0' AND course.personnel_type = '1'
+            course.status = '1' AND course.is_del = '0' AND course.personnel_type = '1' AND course.topic_num>0
             <if test="courseName != null  and courseName != ''"> and course.course_name like concat('%', #{courseName}, '%')</if>
             <if test="dataKind != null  and dataKind != ''"> and course.data_kind = #{dataKind}</if>
             <if test="releaseTimeBegin != null  and releaseTimeBegin != '' and releaseTimeEnd != null  and releaseTimeEnd != ''"> and course.release_time BETWEEN #{releaseTimeBegin} AND #{releaseTimeEnd}</if>

danger-manage-system/src/main/resources/mapper/system/TTrainCourseStatMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TTrainCourseStatMapper">
+
+    <resultMap id="TrainCourseStatResult" type="TrainCourseStat">
+    <result property="courseId"    column="course_id"    />
+    <result property="courseName"    column="course_name"    />
+    <result property="releaseTime"    column="release_time"    />
+    <result property="planName"    column="plan_name"    />
+    <result property="maybeTestNum"    column="maybeTestNum"    />
+    <result property="finishNum"    column="finishNum"    />
+    </resultMap>
+
+    <resultMap id="TrainCourseStatDetailResult" type="TrainCourseStatDetail">
+        <result property="userCourseId" column="user_course_id"></result>
+        <result property="nickName"    column="nick_name"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="finishDuration"    column="finish_duration"    />
+        <result property="trainState"    column="train_state"    />
+        <result property="isComplete"    column="isComplete"    />
+    </resultMap>
+
+    <select id="getTrainCourseStatData" parameterType="com.zehong.system.domain.TrainCourseStat" resultMap="TrainCourseStatResult">
+        SELECT
+          train.course_id,
+          train.course_name,
+          train.release_time,
+          plan.plan_name,
+          (SELECT count(1) FROM t_train_plan_post post WHERE plan_id = plan.plan_id)AS maybeTestNum,
+          (SELECT count(1) FROM t_train_user_course courseUse WHERE courseUse.course_id = train.course_id AND courseUse.train_state = '1')AS finishNum
+        FROM
+            t_train_course train
+        LEFT JOIN t_train_plan plan ON plan.plan_id = train.course_type
+        <where>
+            train.is_del = '0'
+            AND train.status = '1'
+            <if test="courseId != null "> and train.course_id = #{courseId}</if>
+            <if test="courseName !='' and courseName!= null">and train.course_name like concat('%', #{courseName}, '%')</if>
+            <if test="releaseBeginTime != null and releaseEndTime">and train.release_time BETWEEN #{releaseBeginTime} AND #{releaseEndTime} </if>
+        </where>
+        ORDER BY train.release_time DESC
+    </select>
+
+    <select id="getTrainCourseStatDetailData" parameterType="Long" resultMap="TrainCourseStatDetailResult">
+        SELECT
+          courseUse.user_course_id,
+            us.nick_name,
+          dept.dept_name,
+          SEC_TO_TIME(courseUse.finish_duration)AS finish_duration,
+          courseUse.train_state,
+            (
+                CASE courseUse.train_state
+                WHEN '0' THEN
+                    '未完成'
+                WHEN '1' THEN
+                    '完成'
+                END
+            ) AS isComplete
+        FROM
+            t_train_user_course courseUse
+        LEFT JOIN sys_user us ON us.user_id = courseUse.user_id
+        LEFT JOIN sys_dept dept ON dept.dept_id = us.dept_id
+        WHERE courseUse.course_id = #{courseId}
+    </select>
+
+</mapper>

danger-manage-web/package.json

@@ -36,6 +36,7 @@
     "@riophae/vue-treeselect": "^0.4.0",
     "axios": "0.21.0",
     "clipboard": "2.0.6",
+    "gcoord": "^0.3.2",
     "core-js": "^3.19.1",
     "echarts": "^5.3.3",
     "element-ui": "^2.15.10",

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

+import request from '@/utils/request'
+
+// 获取培训统计查询
+export function getTrainCourseStatData(query) {
+  return request({
+    url: '/trainStat/getTrainCourseStatData',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 获取培训统计详情
+export function getTrainCourseStatDetailData(query) {
+  return request({
+    url: '/trainStat/getTrainCourseStatDetailData',
+    method: 'get',
+    params: query
+  })
+}
+
+// 培训统计详情导出
+export function trainCourseStatDetailExport(query) {
+  return request({
+    url: '/trainStat/trainCourseStatDetailExport',
+    method: 'get',
+    params: query
+  })
+}
+

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

 /*
  * @Author: your name
  * @Date: 2021-12-07 14:19:18
- * @LastEditTime: 2022-10-22 10:31:44
+ * @LastEditTime: 2023-03-15 16:47:50
  * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /cesium-vue/src/utils/seieumClass.js
  */
+
+import gcoord from "gcoord";
+import AroundPoint from "./cesiumRoamStart";
+const MAPTYPE = {
+  gps: "WGS84",
+  gaode: "GCJ02",
+  baidu: "BD09",
+};
+
 window.danger = { name: "", colorNum: null, path: [], data: {} };
-window.dangerArr = JSON.parse(localStorage.getItem('J') )?.length>0? JSON.parse(localStorage.getItem('J') ): [];
+window.dangerArr =
+  JSON.parse(localStorage.getItem("J"))?.length > 0
+    ? JSON.parse(localStorage.getItem("J"))
+    : [];
 window.repeat = () => {
   window.danger = { name: "", path: [], data: {} };
 };
@@ -15,8 +27,8 @@ window.save = () => {
   window.dangerArr.push(window.danger);
   const json = JSON.stringify(window.dangerArr);
   localStorage.setItem("J", json);
-  console.log(json)
-  window.repeat()
+  console.log(json);
+  window.repeat();
 };
 
 var viewModel = {
@@ -173,6 +185,8 @@ export default class CreateCesium {
   infowindowTimer = null;
   // 用来记录同频定时器的timer
   animationTimer = null;
+  // 一个漫游对象，从外部引入new的类
+  roamObj = null;
   constructor(container, urlArr, Vue, config) {
     this.vue = Vue;
     console.log("Vue", this.vue.$store);
@@ -295,10 +309,12 @@ export default class CreateCesium {
    * @return {*}
    */
   async addtiles(urlArr, main) {
-    urlArr.forEach((url) => {
+    console.log("urlArr", urlArr);
+    urlArr.forEach((item) => {
       const tileset = new Cesium.Cesium3DTileset({
-        url,
+        url: item.url,
       });
+
       this.scene.primitives.add(tileset);
       // console.log("adsf")
       tileset.readyPromise.then(async (tileset) => {
@@ -308,12 +324,20 @@ export default class CreateCesium {
         );
         const longitudeString = Cesium.Math.toDegrees(cartographic.longitude);
         const latitudeString = Cesium.Math.toDegrees(cartographic.latitude);
-        var gps = [longitudeString, latitudeString];
-        console.log("tileset加载完毕", gps);
+        var lnglat = [longitudeString, latitudeString];
+        console.log("tileset加载完毕", lnglat);
         // 阻塞转换成高德坐标
-        let gaodeLnglat = (await this.gpsToGaode(gps))[0];
-        console.log("坐标换算完毕", gaodeLnglat);
-
+        // 如果startMapType起始是gps，则不转换，如果起始是高德就要转换，因为现在用的是gps的坐标系
+        let nowLngLat;
+        if (item.startMapType === "gps") {
+          nowLngLat = lnglat;
+        } else {
+          // nowLngLat = (await this.gpsToGaode(gps))[0];
+          nowLngLat = this.gaodeToGps(lnglat, item);
+        }
+        // 漫游旋转用的坐标
+        this.romanLngLat = nowLngLat;
+        console.log("坐标换算完毕123123123123123123", nowLngLat);
         // AMap.convertFrom(gps, "gps",  (status, result) =>{
         //   if (result.info === "ok") {
         //     var lnglats = result.locations; // Array.<LngLat>
@@ -326,9 +350,9 @@ export default class CreateCesium {
           0.0
         );
         let offset = Cesium.Cartesian3.fromRadians(
-          Cesium.Math.toRadians(gps[0]),
-          Cesium.Math.toRadians(gps[1]),
-          -161.1
+          Cesium.Math.toRadians(nowLngLat[0]),
+          Cesium.Math.toRadians(nowLngLat[1]),
+          item.height
         );
         // let offset = Cesium.Cartesian3.fromRadians(
         //   Cesium.Math.toRadians(gaodeLnglat.lng),
@@ -345,7 +369,7 @@ export default class CreateCesium {
           color: "color('rgba(255,255,255,1)')",
         });
         // 主场景12312312;
-        console.log("gaodeLnglat", gaodeLnglat);
+        // console.log("gaodeLnglat", gaodeLnglat);
         console.log("main", main);
         // 1.6454928984350525 -1.0974068412623752 0.00004639407505457882 114.14437322429676 38.398663934418344 319.0140849711926
         if (main) {
@@ -354,20 +378,21 @@ export default class CreateCesium {
           setTimeout(() => {
             this.viewer.scene.camera.flyTo({
               destination: Cesium.Cartesian3.fromDegrees(
-                114.08040670822453,
-                38.24912720167037,
+                // 114.08040670822453,
+                // 38.24912720167037,
+                ...nowLngLat,
                 784
               ), //定位坐标点，建议使用谷歌地球坐标位置无偏差
               orientation: {
                 // heading: 1.6454928984350525, // 方向
                 // pitch: -1.0974068412623752, // 倾斜角度
                 // roll: 0.00004639407505457882,
-                // heading: Cesium.Math.toRadians(20.0), // 方向
-                // pitch: Cesium.Math.toRadians(-90.0,), // 倾斜角度
-                // roll: 1.3,
-                heading: Cesium.Math.toRadians(0), // 方向
-                pitch: Cesium.Math.toRadians(-81.61), // 倾斜角度
-                // roll: 1.3,
+                // heading: Cesium.Math.toRadians(0.0), // 方向
+                // pitch: Cesium.Math.toRadians(-81.0,), // 倾斜角度
+                // roll: 5,
+
+                heading: 1.5882496193148399,
+                pitch: -1.5707963057214722,
               },
               duration: 0.1, //定位的时间间隔
             });
@@ -383,6 +408,68 @@ export default class CreateCesium {
       });
     });
   }
+  // 围绕点漫游
+  roamStart() {
+    if (this.roamObj) return;
+    var heading = this.viewer.scene.camera.heading;
+    var pitch = this.viewer.scene.camera.pitch;
+
+    this.viewer.scene.camera.flyTo({
+      destination: Cesium.Cartesian3.fromDegrees(
+        // 114.08040670822453,
+        // 38.24912720167037,
+        ...this.romanLngLat,
+        200
+      ), //定位坐标点，建议使用谷歌地球坐标位置无偏差
+      orientation: {
+        // heading: 1.6454928984350525, // 方向
+        // pitch: -1.0974068412623752, // 倾斜角度
+        // roll: 0.00004639407505457882,
+        // heading: Cesium.Math.toRadians(20.0), // 方向
+        // pitch: Cesium.Math.toRadians(-90.0,), // 倾斜角度
+        // heading: 1.5882496193148399,
+        // pitch: -1.5707963057214722,
+      },
+      duration: 1, //定位的时间间隔
+      complete: () => {
+        console.log("开始漫游");
+
+        this.roamObj = new AroundPoint(
+          this.viewer,
+          0.2,
+          new Cesium.Cartesian3.fromDegrees(...this.romanLngLat),
+          200,
+          // 1.5882496193148399,
+          // -1.5707963057214722
+        );
+        this.roamObj.start();
+      },
+    });
+  }
+
+  roamStop() {
+    if (!this.roamObj) return;
+    this.roamObj.stop();
+    this.roamObj = null;
+  }
+  getcameraPosInfo() {
+    // 获取 相机姿态信息
+    var head = viewer.scene.camera.heading;
+    var pitch = viewer.scene.camera.pitch;
+    var roll = viewer.scene.camera.roll;
+    var info = { head: head, pitch: pitch, roll: roll };
+    // 获取位置 wgs84的地心坐标系，x,y坐标值以弧度来表示
+    var position = viewer.scene.camera.positionCartographic; //with longitude and latitude expressed in radians and height in meters.
+    //以下方式也可以获取相机位置只是返回的坐标系不一样
+    // var position = viewer.scene.camera.position //cartesian3 空间直角坐标系
+    // var ellipsoid = scene.globe.ellipsoid;
+    // var position =ellipsoid.cartesianToCartographic(viewer.scene.camera.position)//
+    // 弧度转经纬度
+    var longitude = Cesium.Math.toDegrees(position.longitude).toFixed(6);
+    var latitude = Cesium.Math.toDegrees(position.latitude).toFixed(6);
+    var height = position.height;
+    return { lng: longitude, lat: latitude, h: height, mat: info };
+  }
 
   // 增加事件监听
   posLng = null;
@@ -576,8 +663,9 @@ export default class CreateCesium {
       // );
     }, Cesium.ScreenSpaceEventType.WHEEL);
     // 摄像机监听
-    this.viewer.camera.changed.addEventListener((percentage) => {
+    this.viewer.camera.changed.addEventListener((percentage, b) => {
       // 打印中心点坐标、高度
+      // console.log(this.viewer.camera)
       // 当鼠地图移动的时候与相机事件隔离
       if (!this.mouseDownFlag) {
         // console.log("相机发生变化");
@@ -1075,6 +1163,18 @@ export default class CreateCesium {
       });
     });
   }
+  // 转换坐标
+  gaodeToGps(lnglatArr, data) {
+    console.log(MAPTYPE[data.startMapType], MAPTYPE[data.toMapType]);
+    let a = gcoord.transform(
+      lnglatArr, // 经纬度坐标
+      gcoord[MAPTYPE[data.startMapType]], // 当前坐标系
+      gcoord[MAPTYPE[data.toMapType]] // 目标坐标系
+      // gcoord.GCJ02,
+      // gcoord.WGS84
+    );
+    return a;
+  }
   // 相机镜头
   zoomTo(tileset) {
     this.viewer.zoomTo(tileset);

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

+/*
+ * @Author: 纪泽龙 jizelong@qq.com
+ * @Date: 2023-03-15 13:49:30
+ * @LastEditors: 纪泽龙 jizelong@qq.com
+ * @LastEditTime: 2023-03-15 16:46:54
+ * @FilePath: /danger-manage-web/src/utils/cesium/cesiumRoamStart.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+
+export default class AroundPoint {
+  constructor(viewer, amount, position, height, heading, pitch) {
+    this._viewer = viewer;
+    this._amount = amount;
+    this._position = position;
+    this.height = height;
+    this.heading = heading;
+    this.pitch = pitch;
+  }
+
+  _bindEvent() {
+    this._viewer.clock.onTick.addEventListener(this._aroundPoint, this);
+  }
+
+  _unbindEvent() {
+    this._viewer.camera.lookAtTransform(Cesium.Matrix4.IDENTITY);
+    this._viewer.clock.onTick.removeEventListener(this._aroundPoint, this);
+  }
+
+  start() {
+    this._viewer.clock.shouldAnimate = true;
+    this._unbindEvent();
+    this._bindEvent();
+    return this;
+  }
+
+  stop() {
+    this._unbindEvent();
+    return this;
+  }
+
+  // 相机绕点旋转函数
+  _aroundPoint() {
+    let heading =  this._viewer.camera.heading;
+    let pitch =  this._viewer.camera.pitch;
+
+    // console.log(Cesium.Math.toRadians(this._amount))
+    heading += Cesium.Math.toRadians(this._amount);
+    if (heading >= Math.PI * 2 || heading <= -Math.PI * 2) {
+      heading =  0
+    }
+    // 用新坐标替换旧坐标
+    this.heading = heading;
+    this.pitch = pitch;
+    this._viewer.camera.lookAt(
+      this._position,
+      new Cesium.HeadingPitchRange(heading, pitch, this.height)
+    );
+  }
+}

danger-manage-web/src/views/bigWindow/index.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-06-16 15:03:40
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-09-15 11:07:10
+ * @LastEditTime: 2023-03-14 09:39:50
  * @FilePath: /danger-manage-web/src/views/bigwindow/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -29,12 +29,12 @@ import Video from "@/components/bigWindow/video";
 import Null from "@/components/bigWindow/Null";
 import Danger from "@/components/bigWindow/Danger";
 import danger from "@/assets/images/danger.png";
-import Editor from '@/components/Editor';
+import Editor from "@/components/Editor";
 
 export default {
   name: "bigWindow",
-  components:{
-    Editor
+  components: {
+    Editor,
   },
   data() {
     return {
@@ -179,10 +179,18 @@ export default {
       ],
     };
   },
+
   mounted() {
     this.Cesium = new CreateCesium(
       "mapbox",
-      ["../3dtiles/jsondata/tileset.json"],
+      [
+        {
+          url: "../3dtiles/jsondata/tileset.json", //路径
+          startMapType: "gps", //初始坐标系
+          toMapType: "",  //要转换坐标系
+          height:-161.1,      //模型高度调整
+        },
+      ],
       this
     );
     this.danger.forEach((item) => {
@@ -205,7 +213,7 @@ export default {
   beforeDestroy() {
     // 挂掉该关的 infowindow 跟计算infowindow位置的计时器
     this.Cesium.clearInfoWindow();
-    this.Cesium.destroy()
+    this.Cesium.destroy();
   },
 };
 </script>
@@ -225,7 +233,7 @@ export default {
     right: 20px;
     z-index: 10;
   }
-  .go-index{
+  .go-index {
     position: fixed;
     top: 20px;
     left: 20px;

danger-manage-web/src/views/dangerScale/profile/index.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-06-16 15:03:40
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2023-02-01 09:48:47
+ * @LastEditTime: 2023-03-14 09:36:37
  * @FilePath: /danger-manage-web/src/views/bigwindow/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -207,7 +207,13 @@ export default {
   mounted() {
     this.Cesium = new CreateCesium(
       "mapbox",
-      ["../3dtiles/jsondata/tileset.json"],
+      // ["../3dtiles/jsondata/tileset.json"],
+      {
+        url: "../3dtiles/jsondata/tileset.json", //路径
+        startMapType: "gps", //初始坐标系
+        toMapType: "", //要转换坐标系
+        height: -161.1, //模型高度调整
+      },
       this
     );
     // this.danger.forEach((item) => {
@@ -251,7 +257,7 @@ export default {
 <style lang="scss" scoped>
 .big-window {
   width: 100%;
-  position:relative;
+  position: relative;
   // height: calc(100vh - 84px);
   height: calc(100vh - 50px);
   #mapbox {

danger-manage-web/src/views/educationPlanExam/lessonsProgram/components/Lesson.vue

@@ -172,7 +172,7 @@ export default {
         enclosure: "",
         isVeriftyFace: "2"
       },
-      fileType: ["doc", "docx", "xls", "xlsx", "ppt", "txt", "pdf"],
+      fileType: ["pdf"],
       fileListVideo: [],
       fileListFile: [],
       readOnly: false,

danger-manage-web/src/views/educationPlanExam/myLessons/CheckLesson/index.vue

@@ -84,7 +84,7 @@
         </div>
       </div>
 
-      <div v-if="state == 2" class="bt flex fz14">
+      <div v-if="state == 2&&lessonData.topicNum!=0" class="bt flex fz14">
         <div class="a">考试结果</div>
         <div style="color: #1d84ff" class="b flex">
           已完成学习，课后测试得分{{ fenshu }}，成绩合格！
@@ -108,6 +108,7 @@
       @jj="jj"
     />
     <el-dialog :visible.sync="iframeVisible" width="80%">
+      <!--<div v-if="userlessonData.state!=3" class="gotime2">{{minute}}:{{calculation(second)}}/{{parseInt(lessonData.duration/60)}}:{{calculation(lessonData.duration%60)}}</div>-->
       <iframe style="width: 100%; height: 600px" :src="ky"></iframe>
     </el-dialog>
   </div>
@@ -367,12 +368,23 @@ export default {
   justify-content:flex-start;
 }
   .gotime{
-    background: #1c84c6;
-    width: 80px;
-    text-align: center;
-    line-height: 22px;
-    color: white;
-    margin-left: 40px;
-    border-radius: 10px;
-  }
+       background: #1c84c6;
+       width: 80px;
+       text-align: center;
+       line-height: 22px;
+       color: white;
+       margin-left: 40px;
+       border-radius: 10px;
+     }
+.gotime2{
+  background: #1c84c6;
+  width: 80px;
+  text-align: center;
+  line-height: 22px;
+  color: white;
+  margin-left: 20px;
+  border-radius: 10px;
+  position: absolute;
+  top: 20px;
+}
 </style>

danger-manage-web/src/views/educationPlanExam/myLessons/components/LearnItem.vue

@@ -18,7 +18,7 @@
     </div>
     <div class="time">发布时间：{{ itemData.createTime }}</div>
     <div class="bottom flex">
-      <div v-if="!itemData.state===4 || !(itemData.state===3 && itemData.dataKind==='1')"  @click="click" class="btn" :class="{ again: yesOrNo }">
+      <div v-if="itemData.state!=4 && !(itemData.state===3 && itemData.dataKind==='1')"  @click="click" class="btn" :class="{ again: yesOrNo }">
         {{ yesOrNo  }}
       </div>
     </div>
@@ -71,9 +71,9 @@ export default {
         if( this.itemData.state === 0){
           return '开始学习'
         }else if(this.itemData.state === 1){
-          return '重新考试'
+          return '查看课程'
         }else if(this.itemData.state === 2){
-          return '重新考试'
+          return '查看课程'
         }else if(this.itemData.state === 3){
           return '开始学习'
         }else if(this.itemData.state === 4){

danger-manage-web/src/views/educationPlanExam/testStat/index.vue

@@ -227,10 +227,10 @@
         this.testStatDetailOpen = true;
         this.courseName=courseName;
         this.queryDetailParams.courseId=courseId;
-        this.getTestStatDetails(courseId);
+        this.getTestStatDetails();
       },
-      getTestStatDetails(courseId){
-        this.queryDetailParams.courseId = courseId;
+      getTestStatDetails(){
+        //this.queryDetailParams.courseId = courseId;
         testPersonDetailByCourseId(this.queryDetailParams).then(res =>{
           this.testStatDetailData = res.rows.map((item, index) => {
             return {

danger-manage-web/src/views/educationPlanExam/trainCourseStat/index.vue

+<template>
+  <div style="margin: 10px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      label-width="68px">
+
+      <el-form-item label="培训名称" prop="courseName">
+        <el-input
+          v-model="queryParams.courseName"
+          placeholder="请输入培训名称"
+          clearable
+          size="small"
+        />
+      </el-form-item>
+
+      <el-form-item label="发布时间" prop="releaseTime">
+        <el-date-picker
+          v-model="releaseTime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="dateFormat">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="search"
+        >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetClick"
+        >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <!-- 培训统计列表 -->
+    <el-table v-loading="loading" :data="trainCourseStatData">
+      <el-table-column label="序号" width='100' align="center" prop="courseNum"/>
+      <el-table-column label="课程标题" align="center" prop="courseName"/>
+      <el-table-column label="培训计划" align="center" prop="planName"/>
+      <el-table-column label="应参加人数" align="center" prop="maybeTestNum"/>
+      <el-table-column label="实际完成人数" align="center" prop="finishNum"/>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template v-slot="{ row: { courseId, courseName }}">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="trainCourseStatDetail(courseId,courseName)"
+          >查看详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 列表分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getTrainStatList"
+    />
+
+    <!-- 详情 -->
+    <el-dialog :title="'培训详情：'+courseName" :visible.sync="trainStatDetailOpen" append-to-body :close-on-click-modal="false">
+
+      <el-button
+        type="warning"
+        plain
+        icon="el-icon-download"
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        style="position: relative;left: 16px;top: -17px;"
+      >导出</el-button>
+
+      <el-table v-loading="loading" :data="trainStatDetailData">
+        <el-table-column label="序号" width='100' align="center" prop="detailNum"/>
+        <el-table-column label="培训人员" align="center" prop="nickName"/>
+        <el-table-column label="所属部门" align="center" prop="deptName"/>
+        <el-table-column label="培训时长" align="center" prop="finishDuration"/>
+        <el-table-column label="是否完成" align="center" prop="isComplete"/>
+      </el-table>
+
+      <pagination
+        v-show="totalDetail > 0"
+        :total="totalDetail"
+        :page.sync="queryDetailParams.pageNum"
+        :limit.sync="queryDetailParams.pageSize"
+        @pagination="getTrainStatDetail"
+      />
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {getTrainCourseStatData,getTrainCourseStatDetailData,trainCourseStatDetailExport} from "@/api/contractTrain/trainCourseStat";
+export default {
+  name: "trainCourseStat",
+  components: {
+  },
+  data() {
+    return {
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        courseName:"",
+        releaseBeginTime: "",
+        releaseEndTime: ""
+      },
+      releaseTime: "",
+      trainCourseStatData: [],
+      // 遮罩层
+      loading: false,
+      // 总条数
+      total: 0,
+      totalDetail: 0,
+      queryDetailParams:{
+        pageNum: 1,
+        pageSize: 10,
+        courseId: ""
+      },
+      courseName: "",
+      trainStatDetailOpen: false,
+      trainStatDetailData: [],
+      exportLoading: false
+    }
+  },
+  created() {
+    this.getTrainStatList();
+  },
+  methods: {
+    dateFormat(picker){
+      this.queryParams.releaseBeginTime = picker[0];
+      this.queryParams.releaseEndTime = picker[1];
+    },
+    search(){
+      this.getTrainStatList();
+    },
+    resetClick(){
+      this.releaseTime = "";
+      this.queryParams.releaseBeginTime = null;
+      this.queryParams.releaseEndTime = null;
+      this.queryParams={
+        pageNum: 1,
+        pageSize: 10,
+        courseName:"",
+        releaseBeginTime: "",
+        releaseEndTime: ""
+      };
+      this.getTrainStatList();
+    },
+    getTrainStatList(){
+      getTrainCourseStatData(this.queryParams).then(res =>{
+        this.trainCourseStatData = res.rows.map((item, index) => {
+            return {
+                courseNum:
+                index +
+                1 +
+                (this.queryParams.pageNum - 1) * this.queryParams.pageSize,
+                ...item,
+            };
+        });
+        this.total = res.total;
+      })
+    },
+    trainCourseStatDetail(courseId,courseName){
+      this.queryDetailParams.courseId = courseId;
+      this.courseName = courseName;
+      this.queryDetailParams.pageNum = 1;
+      this.queryDetailParams.pageSize = 10;
+      this.getTrainStatDetail();
+      this.trainStatDetailOpen = true;
+    },
+    getTrainStatDetail(){
+      getTrainCourseStatDetailData(this.queryDetailParams).then(res =>{
+          this.trainStatDetailData = res.rows.map((item, index) => {
+          return {
+                detailNum:
+                index +
+                1 +
+                (this.queryDetailParams.pageNum - 1) * this.queryDetailParams.pageSize,
+                ...item,
+            };
+          });
+        this.totalDetail = res.total;
+      })
+    },
+    handleExport(){
+      this.$confirm('是否确认导出所有培训详细数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+         return trainCourseStatDetailExport({"courseId":this.queryDetailParams.courseId});
+        }).then(response => {
+            this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

danger-manage-web/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-03 10:51:24
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-11-22 14:16:37
+ * @LastEditTime: 2023-03-15 17:59:14
  * @FilePath: /danger-manage-web/src/views/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -362,10 +362,31 @@ export default {
   mounted() {
     this.Cesium = new CreateCesium(
       "mapbox",
-      ["../3dtiles/jsondata/tileset.json"],
+      // ["../3dtiles/jsondata/tileset.json"],
+      [
+        {
+          url: "../3dtiles/jsondata/tileset.json", //路径
+          startMapType: "gps", //初始坐标系
+          toMapType: "", //要转换坐标系
+          height: -161.1, //模型高度调整
+        },
+        // {
+        //   url: "../3dtiles/ZeHongZhuanHuan/tileset.json",
+        //   startMapType: "gps",
+        //   toMapType: "gps",
+        //   height: 35  ,
+        // },
+        // {
+        //   url: "../3dtiles/MapTilerCeShi/tileset.json",
+        //   startMapType: "gaode",
+        //   toMapType: "gps",
+        //   height: -161,
+        // },
+      ],
       this
     );
     this.init();
+    window.C = this.Cesium;
   },
   beforeDestroy() {
     // 挂掉该关的 infowindow 跟计算infowindow位置的计时器
@@ -436,7 +457,7 @@ export default {
             // 视频
 
             if (item.mapDeviceType == 5) {
-            console.log(item,"item");
+              console.log(item, "item");
               obj = {
                 latitude: item.latitude,
                 longitude: item.longitude,
@@ -460,7 +481,9 @@ export default {
                 // 探测介质
                 tcjz: item.mapDeviceMedium,
                 sbzt: item.monitorDeviceStatus,
-                jcz:item.monitorValue?item.monitorValue + "" + item.mapDeviceUnit:'-',
+                jcz: item.monitorValue
+                  ? item.monitorValue + "" + item.mapDeviceUnit
+                  : "-",
                 shortNum: 12,
                 config: { scale: 1, textHeight: -94 },
               };