diff --git a/src/views/large-screen/api.js b/src/views/large-screen/api.js index 61b64a3a..19895da6 100644 --- a/src/views/large-screen/api.js +++ b/src/views/large-screen/api.js @@ -79,7 +79,7 @@ export const dataOverview = (arg) => { } export const iwarnlist = (arg) => { return axios.request({ - url: 'iwarn/list', + url: '/iwarn/list', method: 'get', params: arg, dataType: 'json' diff --git a/src/views/large-screen/echartsOptions.js b/src/views/large-screen/echartsOptions.js index 15b0faed..ae40aeb7 100644 --- a/src/views/large-screen/echartsOptions.js +++ b/src/views/large-screen/echartsOptions.js @@ -22,7 +22,7 @@ export function echartsBing({ data, total }) { verticalAlign: 'center' // 副标题垂直居中 }, left: '23%', // 整体标题水平居中放置,这里用center替代x属性 - top: '54%' // 整体标题垂直居中放置,这里用top替代y属性 + top: '42%' // 整体标题垂直居中放置,这里用top替代y属性 }, // 图例 legend: [{ @@ -55,8 +55,8 @@ export function echartsBing({ data, total }) { series: [{ name: '车辆机械设备分布', type: 'pie', - radius: ['40%', '70%'], // 环形图内外半径 - center: ['30%', '60%'], + radius: ['50%', '85%'], // 环形图内外半径 + center: ['30%', '50%'], avoidLabelOverlap: false, label: { normal: { @@ -132,7 +132,7 @@ export function echartsZhu({ }, }], grid: { - top: '15%', + top: '20%', left: '7.5%', bottom: '12%', right: '3%', diff --git a/src/views/large-screen/index.vue b/src/views/large-screen/index.vue index 9d74ee68..349c112f 100644 --- a/src/views/large-screen/index.vue +++ b/src/views/large-screen/index.vue @@ -156,7 +156,7 @@
进度预警
- +
暂无进度预警
@@ -170,7 +170,7 @@
开始时间:{{ item.startTime }}
计划结束时间:{{ item.endTime }}
当前进度:
+ color="#0AA0FE" :stroke-width="8" :percentage="Number(item.accumulativeProgress?item.accumulativeProgress:0)" class="jd">
@@ -189,7 +189,8 @@
累计进度
- @@ -230,7 +231,8 @@
是否超温
- @@ -249,12 +251,12 @@
{{ item.maskState == 3 ? '带口罩' : item.maskState == 2 ? '没带口罩' : '未识别' }}
-
+
{{ item.overTemp ? '是' : '否' }}
- +
暂无门禁记录
@@ -312,8 +314,8 @@ const state = reactive({ "dataSource": 1, "supplementFormId": null, "number": null, - imageType:1, - openType:43, + imageType: 1, + openType: 43, startSwingTime: "2025-05-13 02:17:55", }, { "id": 17, @@ -331,8 +333,8 @@ const state = reactive({ "dataSource": 1, "supplementFormId": null, "number": null, - imageType:2, - openType:42, + imageType: 2, + openType: 42, startSwingTime: "2025-05-13 02:17:55", }, { "id": 17, @@ -350,8 +352,8 @@ const state = reactive({ "dataSource": 1, "supplementFormId": null, "number": null, - imageType:1, - openType:42, + imageType: 1, + openType: 42, startSwingTime: "2025-05-13 02:17:55", }, { "id": 17, @@ -369,8 +371,8 @@ const state = reactive({ "dataSource": 1, "supplementFormId": null, "number": null, - imageType:1, - openType:42, + imageType: 1, + openType: 42, startSwingTime: "2025-05-13 02:17:55", }, { "id": 17, @@ -388,8 +390,8 @@ const state = reactive({ "dataSource": 1, "supplementFormId": null, "number": null, - imageType:2, - openType:42, + imageType: 2, + openType: 42, startSwingTime: "2025-05-13 02:17:55", }, { "id": 17, @@ -407,8 +409,8 @@ const state = reactive({ "dataSource": 1, "supplementFormId": null, "number": null, - imageType:1, - openType:42, + imageType: 1, + openType: 42, startSwingTime: "2025-05-13 02:17:55", }, { "id": 17, @@ -426,8 +428,8 @@ const state = reactive({ "dataSource": 1, "supplementFormId": null, "number": null, - imageType:1, - openType:42, + imageType: 1, + openType: 42, startSwingTime: "2025-05-13 02:17:55", }], warnList: [], @@ -547,11 +549,11 @@ function engineeringLog(params) { \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index 40e0d179..78f926c3 100644 --- a/vite.config.js +++ b/vite.config.js @@ -43,9 +43,9 @@ export default defineConfig(({ mode, command }) => { }, proxy: { '/dev-api': { - target: 'http://192.168.2.39:8581', + // target: 'http://192.168.2.39:8581', // target: 'http://192.168.2.223:8080', - // target: 'http://39.100.74.100:8581', + target: 'http://39.100.74.100:8581', changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, '') }