diff --git a/.env.dev b/.env.dev new file mode 100644 index 00000000..5102c60b --- /dev/null +++ b/.env.dev @@ -0,0 +1,5 @@ +NODE_ENV = dev +VITE_NAME="dev" +# 电网一张图 地图图层 +VITE_NARIMAP=null +VITE_NRGISCOMMON=null diff --git a/.env.jibei b/.env.jibei new file mode 100644 index 00000000..cc94a334 --- /dev/null +++ b/.env.jibei @@ -0,0 +1,7 @@ +NODE_ENV = jibei +VITE_NAME="jibei" +# 电网一张图 地图图层 +VITE_NARIMAP="http://25.42.182.218/narimap/libs/narimap.umd.min.js" +VITE_NRGISCOMMON="http://25.42.182.218/narimap/libs/nrgis-common/libs/index.min.js" +# \ No newline at end of file diff --git a/index.html b/index.html index eca0104e..2ffc02ca 100644 --- a/index.html +++ b/index.html @@ -16,9 +16,9 @@ - - + + +
diff --git a/src/api/harmonic-boot/harmonic.ts b/src/api/harmonic-boot/harmonic.ts index 9ea1a836..6a494662 100644 --- a/src/api/harmonic-boot/harmonic.ts +++ b/src/api/harmonic-boot/harmonic.ts @@ -7,3 +7,12 @@ export function getHistoryResult(data: any) { data: data }) } +// word报告 +export function exportModelJB(data: any) { + return request({ + url: '/harmonic-boot/exportmodel/exportModelJB', + method: 'post', + responseType: 'blob', + data: data + }) +} diff --git a/src/components/PreviewFile/index.vue b/src/components/PreviewFile/index.vue index b4d7e454..d1884de0 100644 --- a/src/components/PreviewFile/index.vue +++ b/src/components/PreviewFile/index.vue @@ -22,7 +22,7 @@ import VueOfficePdf from '@vue-office/pdf' const { push, options, currentRoute } = useRouter() // const url = 'http://192.168.1.22:9009/excelreport' + currentRoute.value.href?.split('?')[1] // http://192.168.1.22:9009/excelreport/onlineReport/%E7%94%B5%E8%83%BD%5B%E5%91%8A%5D2024%E5%B9%B41%E5%8F%B7-%E5%BC%A0%E5%AE%B6%E5%8F%A3%E5%9C%B0%E5%B8%82%20%E7%94%B5%E8%83%BD%E8%B4%A8%E9%87%8F%E6%8A%80%E6%9C%AF%E7%9B%91%E7%9D%A3%E5%91%8A%E8%AD%A6%E5%8D%95.docx?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minio%2F20240807%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240807T021320Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=0173318ad09fa6cc9067123b6997f423c692c820ef9e185ca7dda300e5f7853c -const url = '/api-docx/excelreport' + currentRoute.value.href?.split('?')[1] +const url = '/api-docx/excelreport' + cuwrrentRoute.value.href?.split('?')[1] onMounted(() => { console.log() }) diff --git a/src/utils/request.ts b/src/utils/request.ts index 77009f4b..a6fa5c30 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -106,7 +106,8 @@ function createAxios>( response.data.code === 'A0000' || response.data.type === 'application/json' || Array.isArray(response.data) || - response.data.size + response.data.size || + response.config.url == '/harmonic-boot/exportmodel/exportModelJB' // || // response.data.type === 'application/octet-stream' || // response.data.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue index 86fc8800..2f0b4c7d 100644 --- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue +++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue @@ -75,19 +75,23 @@ diff --git a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue index 87d841a7..9171aa4f 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue @@ -46,7 +46,7 @@ - + @@ -356,11 +356,11 @@ const info = (row: any) => { }), axisLabel: { color: '#000', - fontSize: 12 + fontSize: 10 } }, grid: { - top: '30px', + top: '35px', left: '10px', right: '20px' }, @@ -606,7 +606,7 @@ defineExpose({ info, show }) justify-content: space-between; // grid-template-columns: 1fr 1fr 1fr; margin-top: 10px; - margin-bottom: 10px; + margin-bottom: 3px; .line { display: inline-block; width: 0.5rem; diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue b/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue index a5f365f2..91f7409f 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue @@ -146,7 +146,8 @@ const echart = (row: any) => { fontSize: 14 }, backgroundColor: 'rgba(0,0,0,0.35)', - borderWidth: 0 + borderWidth: 0, + position:'bottom' }, legend: { data: row.map((item: any) => item.time), diff --git a/src/views/pqs/qualityInspeection/panorama/index.vue b/src/views/pqs/qualityInspeection/panorama/index.vue index efe225f1..debe0eb6 100644 --- a/src/views/pqs/qualityInspeection/panorama/index.vue +++ b/src/views/pqs/qualityInspeection/panorama/index.vue @@ -26,7 +26,14 @@ - +
@@ -48,7 +55,7 @@