diff --git a/.env.development b/.env.development index 45d96cc..e1d3136 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 # VITE_API_URL = 'http://192.168.34.155:28890' #彭杰鞍钢本地 -VITE_API_URL = 'http://192.168.34.155:19111' -# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 +# VITE_API_URL = 'http://192.168.34.155:19111' +VITE_API_URL = 'http://192.168.34.221:8111' #雄哥本地 # VITE_API_URL = 'http://192.168.34.221:19112' #雄哥本地 # VITE_API_URL = 'http://192.168.34.221:28890' #雄哥本地 # VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 diff --git a/package-lock.json b/package-lock.json index 4f6b6b7..4b0046e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,7 @@ "element-china-area-data": "^5.0.2", "element-plus": "^2.2.30", "ezuikit-js": "^7.7.8", + "hls.js": "^1.6.7", "jquery": "^3.7.1", "jquery-ui": "^1.13.2", "jquery-ui-dist": "^1.13.2", @@ -8912,6 +8913,11 @@ "xtend": "~4.0.1" } }, + "node_modules/hls.js": { + "version": "1.6.7", + "resolved": "https://registry.npmmirror.com/hls.js/-/hls.js-1.6.7.tgz", + "integrity": "sha512-QW2fnwDGKGc9DwQUGLbmMOz8G48UZK7PVNJPcOUql1b8jubKx4/eMHNP5mGqr6tYlJNDG1g10Lx2U/qPzL6zwQ==" + }, "node_modules/homedir-polyfill": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", @@ -23322,6 +23328,11 @@ } } }, + "hls.js": { + "version": "1.6.7", + "resolved": "https://registry.npmmirror.com/hls.js/-/hls.js-1.6.7.tgz", + "integrity": "sha512-QW2fnwDGKGc9DwQUGLbmMOz8G48UZK7PVNJPcOUql1b8jubKx4/eMHNP5mGqr6tYlJNDG1g10Lx2U/qPzL6zwQ==" + }, "homedir-polyfill": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", diff --git a/package.json b/package.json index c9bada0..fdd3fd8 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "element-china-area-data": "^5.0.2", "element-plus": "^2.2.30", "ezuikit-js": "^7.7.8", + "hls.js": "^1.6.7", "jquery": "^3.7.1", "jquery-ui": "^1.13.2", "jquery-ui-dist": "^1.13.2", diff --git a/src/api/modules/workTicket.ts b/src/api/modules/workTicket.ts new file mode 100644 index 0000000..70cc04a --- /dev/null +++ b/src/api/modules/workTicket.ts @@ -0,0 +1,32 @@ + +import http from "@/api"; +const BASEURL = import.meta.env.VITE_API_URL; + +// 统计工作票 +export const getWorkTicketCountWorkTicketApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/workTicket/countWorkTicket`, params); +}; +// 分页列表查询工作票信息 +export const getWorkTicketPageApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/workTicket/page`, params); +}; +// 树形分页列表查询工作票类型信息 +export const getWorkTicketTypeTreePageApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/workTicketType/tree/page`, params); +}; +// 通过id查询工作票信息 +export const getWorkTicketQueryByIdApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/workTicket/queryById`, params); +}; +// 列表查询工作票历史记录信息 +export const getWorkTicketHistoryListApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/workTicketHistory/list`, params); +}; +// 根据itemId查询视频播放url +export const getVideoItemInfoPoliceCameraItemApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/policeCameraItem/getVideoItemInfo`, params); +}; +// 分页列表查询执法记录仪设备列表信息 +export const getPoliceCameraItemPageApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/policeCameraItem/page`, params); +}; \ No newline at end of file diff --git a/src/assets/images/cardImg1.png b/src/assets/images/cardImg1.png new file mode 100644 index 0000000..16f34b9 Binary files /dev/null and b/src/assets/images/cardImg1.png differ diff --git a/src/assets/images/workTicket/bodyworn_audio.png b/src/assets/images/workTicket/bodyworn_audio.png new file mode 100644 index 0000000..f576581 Binary files /dev/null and b/src/assets/images/workTicket/bodyworn_audio.png differ diff --git a/src/assets/images/workTicket/bodyworn_pause.png b/src/assets/images/workTicket/bodyworn_pause.png new file mode 100644 index 0000000..8743636 Binary files /dev/null and b/src/assets/images/workTicket/bodyworn_pause.png differ diff --git a/src/assets/images/workTicket/bodyworn_play.png b/src/assets/images/workTicket/bodyworn_play.png new file mode 100644 index 0000000..993aa60 Binary files /dev/null and b/src/assets/images/workTicket/bodyworn_play.png differ diff --git a/src/assets/images/workTicket/index-icon1.png b/src/assets/images/workTicket/index-icon1.png new file mode 100644 index 0000000..1085a2e Binary files /dev/null and b/src/assets/images/workTicket/index-icon1.png differ diff --git a/src/assets/images/workTicket/index-icon10.png b/src/assets/images/workTicket/index-icon10.png new file mode 100644 index 0000000..beeb994 Binary files /dev/null and b/src/assets/images/workTicket/index-icon10.png differ diff --git a/src/assets/images/workTicket/index-icon2.png b/src/assets/images/workTicket/index-icon2.png new file mode 100644 index 0000000..78244c1 Binary files /dev/null and b/src/assets/images/workTicket/index-icon2.png differ diff --git a/src/assets/images/workTicket/index-icon3.png b/src/assets/images/workTicket/index-icon3.png new file mode 100644 index 0000000..99ece33 Binary files /dev/null and b/src/assets/images/workTicket/index-icon3.png differ diff --git a/src/assets/images/workTicket/index-icon4.png b/src/assets/images/workTicket/index-icon4.png new file mode 100644 index 0000000..080f8c5 Binary files /dev/null and b/src/assets/images/workTicket/index-icon4.png differ diff --git a/src/assets/images/workTicket/index-icon5.png b/src/assets/images/workTicket/index-icon5.png new file mode 100644 index 0000000..685aea6 Binary files /dev/null and b/src/assets/images/workTicket/index-icon5.png differ diff --git a/src/assets/images/workTicket/index-icon6.png b/src/assets/images/workTicket/index-icon6.png new file mode 100644 index 0000000..00aba24 Binary files /dev/null and b/src/assets/images/workTicket/index-icon6.png differ diff --git a/src/assets/images/workTicket/index-icon7.png b/src/assets/images/workTicket/index-icon7.png new file mode 100644 index 0000000..8f9abed Binary files /dev/null and b/src/assets/images/workTicket/index-icon7.png differ diff --git a/src/assets/images/workTicket/index-icon8.png b/src/assets/images/workTicket/index-icon8.png new file mode 100644 index 0000000..2754f9d Binary files /dev/null and b/src/assets/images/workTicket/index-icon8.png differ diff --git a/src/assets/images/workTicket/index-icon9.png b/src/assets/images/workTicket/index-icon9.png new file mode 100644 index 0000000..8d83954 Binary files /dev/null and b/src/assets/images/workTicket/index-icon9.png differ diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index f06c487..8628e6c 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -112,6 +112,11 @@ export const staticRouter: RouteRecordRaw[] = [ name: "工程概况-2", component: () => import("@/views/sevenLargeScreen/comprehensiveManage/projectOverviewL/index.vue") }, + { + path: "/homeworkControlProcess", + name: "作业过程管控", + component: () => import("@/views/sevenLargeScreen/homeworkControlProcess/index.vue") + }, // { // path: "/projectOverviewer", // name: "工程概况-1", diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/rightBottom.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/rightBottom.vue index 7b73cb6..6b46721 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/rightBottom.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/rightBottom.vue @@ -465,7 +465,7 @@ const getList = async () => { const res = await getCurrentDayAirQualityApi({ projectSn: store.sn }); console.log("获取环境监测数据", res); if (res.result) { - analysisData.value = res.result.analysisData; + analysisData.value = res.result.analysisData ? res.result.analysisData : ""; } drawChart(); }; diff --git a/src/views/sevenLargeScreen/headNoise/leftTop.vue b/src/views/sevenLargeScreen/headNoise/leftTop.vue index ae86f7f..245c0e0 100644 --- a/src/views/sevenLargeScreen/headNoise/leftTop.vue +++ b/src/views/sevenLargeScreen/headNoise/leftTop.vue @@ -461,7 +461,7 @@ const getList = async () => { console.log("获取环境监测数据", res); if (res.result) { analysisType.value = res.result.analysisType; - analysisData.value = res.result.analysisData; + analysisData.value = res.result.analysisData ? res.result.analysisData : ""; } console.log("analysisType", analysisType.value); console.log("analysisData", analysisData.value); diff --git a/src/views/sevenLargeScreen/homeworkControlProcess/components/HlsPlayer.vue b/src/views/sevenLargeScreen/homeworkControlProcess/components/HlsPlayer.vue new file mode 100644 index 0000000..614b5d2 --- /dev/null +++ b/src/views/sevenLargeScreen/homeworkControlProcess/components/HlsPlayer.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/views/sevenLargeScreen/homeworkControlProcess/index.vue b/src/views/sevenLargeScreen/homeworkControlProcess/index.vue new file mode 100644 index 0000000..27ea3b9 --- /dev/null +++ b/src/views/sevenLargeScreen/homeworkControlProcess/index.vue @@ -0,0 +1,1644 @@ + + + + + diff --git a/src/views/sevenLargeScreen/rainfallMonitoring/leftTop.vue b/src/views/sevenLargeScreen/rainfallMonitoring/leftTop.vue index 6bbeb42..6dd7510 100644 --- a/src/views/sevenLargeScreen/rainfallMonitoring/leftTop.vue +++ b/src/views/sevenLargeScreen/rainfallMonitoring/leftTop.vue @@ -461,7 +461,7 @@ const getList = async () => { console.log("获取环境监测数据", res); if (res.result) { analysisType.value = res.result.analysisType; - analysisData.value = res.result.analysisData; + analysisData.value = res.result.analysisData ? res.result.analysisData : ""; } console.log("analysisType", analysisType.value); console.log("analysisData", analysisData.value);