瀏覽代碼

fix: 调整瑞鹰看板横坐标与存货分布标签展示

Zimo 10 小時之前
父節點
當前提交
3744e62320

+ 1 - 1
.env.local

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径  http://192.168.188.200:48080  https://iot.deepoil.cc  http://172.26.0.56:48080
-VITE_BASE_URL='https://iot.deepoil.cc'
+VITE_BASE_URL='https://172.21.0.198'
 
 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

+ 6 - 0
src/views/pms/stat/rykb/inventory-situation.vue

@@ -237,6 +237,9 @@ function getDistributionOption(data: InventoryItem[]): echarts.EChartsOption {
         radius: layout.distributionPieRadius,
         center: ['27%', layout.distributionPieCenterY],
         minAngle: 5,
+        label: {
+          show: false
+        },
         data: data.map((item) => ({
           name: item.project,
           value: item.mayInventoryAmount
@@ -248,6 +251,9 @@ function getDistributionOption(data: InventoryItem[]): echarts.EChartsOption {
         radius: layout.distributionPieRadius,
         center: ['73%', layout.distributionPieCenterY],
         minAngle: 5,
+        label: {
+          show: false
+        },
         data: data
           .filter((item) => item.mayBacklogAmount > 0)
           .map((item) => ({

+ 4 - 4
src/views/pms/stat/rykb/rydeviceList.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { IotStatApi } from '@/api/pms/stat'
-import { rangeShortcuts } from '@/utils/formatTime'
 import dayjs from 'dayjs'
 
 interface RhDeviceListRow {
@@ -22,9 +21,10 @@ interface RhTeamRateRow {
 }
 
 const TEAM_TABLE_HEIGHT = 500
-const DEFAULT_TIME_RANGE = rangeShortcuts[2]
-  .value()
-  .map((item) => dayjs(item).format('YYYY-MM-DD HH:mm:ss'))
+const DEFAULT_TIME_RANGE = [
+  dayjs().subtract(7, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+]
 
 const createTime = ref<string[]>(DEFAULT_TIME_RANGE)
 const loading = ref(false)

+ 0 - 1
src/views/pms/stat/rykb/xjwork.vue

@@ -75,7 +75,6 @@ function getChartOption(data: ChartData): echarts.EChartsOption {
         color: THEME.text.regular,
         fontSize: 14,
         fontFamily: FONT_FAMILY,
-        width: 78,
         overflow: 'break'
       }
     },

+ 5 - 5
src/views/pms/stat/rykb/zjfinish.vue

@@ -46,7 +46,7 @@ function getChartOption(data: ChartData): echarts.EChartsOption {
     grid: {
       ...THEME.grid,
       top: 50,
-      bottom: 10
+      bottom: 0
     },
     tooltip: createTooltip({
       trigger: 'axis',
@@ -76,11 +76,11 @@ function getChartOption(data: ChartData): echarts.EChartsOption {
       },
       axisLabel: {
         interval: 0,
+        rotate: 30,
+        margin: 6,
         color: THEME.text.regular,
-        fontSize: 14,
-        fontFamily: FONT_FAMILY,
-        width: 54,
-        overflow: 'break'
+        fontSize: 12,
+        fontFamily: FONT_FAMILY
       }
     },
     yAxis: {