From 700bff6e3800070f9796b49f365a39ec422b008d Mon Sep 17 00:00:00 2001
From: zhongzm <zhongzm@agt.com>
Date: Tue, 15 Oct 2024 17:48:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=85=B3=E9=94=AE=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                |   1 +
 src/views/perfManage/kpiKeyTarget/index.vue | 284 +++++++++++++-------
 2 files changed, 190 insertions(+), 95 deletions(-)

diff --git a/package.json b/package.json
index 7d8eed07..4801fb8f 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "dayjs": "^1.11.11",
     "echarts": "~5.5.0",
     "file-saver": "^2.0.5",
+    "grid-layout-plus": "^1.0.5",
     "intl-tel-input": "^23.8.1",
     "js-base64": "^3.7.7",
     "js-cookie": "^3.0.5",
diff --git a/src/views/perfManage/kpiKeyTarget/index.vue b/src/views/perfManage/kpiKeyTarget/index.vue
index 2d4feb85..3913e2cc 100644
--- a/src/views/perfManage/kpiKeyTarget/index.vue
+++ b/src/views/perfManage/kpiKeyTarget/index.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import draggable from 'vuedraggable';
+import { GridLayout, GridItem } from 'grid-layout-plus'
 import * as echarts from 'echarts';
 import { PageContainer } from 'antdv-pro-layout';
-import { onMounted, reactive, ref, markRaw, nextTick, onUnmounted} from 'vue';
+import { onMounted, reactive, ref, markRaw, nextTick, onUnmounted, watch } from 'vue';
 import { RESULT_CODE_ERROR, RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { SizeType } from 'ant-design-vue/es/config-provider';
 import { listKPIData, getKPITitle } from '@/api/perfManage/goldTarget';
@@ -10,12 +10,11 @@ import useI18n from '@/hooks/useI18n';
 import { parseDateToStr } from '@/utils/date-utils';
 import dayjs, { Dayjs } from 'dayjs';
 import useNeInfoStore from '@/store/modules/neinfo';
-import { message } from 'ant-design-vue';
+import { message, Switch, Form } from 'ant-design-vue';
 import { ColumnsType } from 'ant-design-vue/es/table';
 import { generateColorRGBA } from '@/utils/generate-utils';
 import { LineSeriesOption } from 'echarts/charts';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
-import { Switch } from 'ant-design-vue';
 const { t, currentLocale } = useI18n();
 
 const neInfoStore = useNeInfoStore();
@@ -34,10 +33,53 @@ const handleRealTimeSwitch = (checked: any) => {
 // 网元数组
 const networkElementTypes = ['udm', 'upf', 'amf', 'smf', 'ims','ausf'] as const;
 // 定义 ChartType
-type ChartType = typeof networkElementTypes[number];
+type ChartType = typeof networkElementTypes[number];  // 将 i 的类型改为 ChartType
+
+// 添加类型定义
+interface LayoutItem {
+  x: number;
+  y: number;
+  w: number;
+  h: number;
+  i: ChartType;  // 将 i 的类型改为 ChartType
+}
+
+type Layout = LayoutItem[];
 
 //构建响应式数组储存图表类型数据
-const chartOrder = ref([...networkElementTypes]);
+const chartOrder = ref<Layout>(
+  networkElementTypes.map((type, index) => ({
+    x: index % 2 * 6,  // 每行两个图表，宽度为6
+    y: Math.floor(index / 2) * 4,  // 每个图表占据 4 个单位高度
+    w: 6,  // 宽度为6个单位
+    h: 4,  // 高度为4个单位
+    i: type,  // 使用网元类型作为唯一标识符
+  }))
+);
+
+// 改变布局触发更新
+const handleLayoutUpdated = (newLayout: Layout) => {
+  chartOrder.value = newLayout;
+  nextTick(() => {
+    newLayout.forEach((item) => {
+      const state = chartStates[item.i];
+      if (state.chart.value) {
+        state.chart.value.resize();
+      }
+    });
+  });
+};
+
+// 监听 chartOrder 的变化
+watch(chartOrder, () => {
+  nextTick(() => {
+    Object.values(chartStates).forEach(state => {
+      if (state.chart.value) {
+        state.chart.value.resize();
+      }
+    });
+  });
+});
 
 // 定义表格状态类型
 type TableStateType = {
@@ -79,8 +121,7 @@ const chartStates: Record<ChartType, ReturnType<typeof createChartState>> = Obje
 ) as Record<ChartType, ReturnType<typeof createChartState>>;
 
 //日期选择器
-interface RangePicker {
-  [key: string]: [string, string] | Record<string, [Dayjs, Dayjs]>;
+interface RangePicker extends Record<ChartType, [string, string]> {
   placeholder: [string, string];
   ranges: Record<string, [Dayjs, Dayjs]>;
 }
@@ -90,10 +131,10 @@ const rangePicker = reactive<RangePicker>({
   ...Object.fromEntries(networkElementTypes.map(type => [
     type,
     [
-      dayjs('2024-09-20 00:00:00').valueOf().toString(),//模拟数据日期为9月20日数据
+      dayjs('2024-09-20 00:00:00').valueOf().toString(),//模拟数据的日期设为默认日期
       dayjs('2024-09-20 23:59:59').valueOf().toString()
     ]
-  ])),
+  ])) as Record<ChartType, [string, string]>,
   placeholder: [t('views.monitor.monitor.startTime'), t('views.monitor.monitor.endTime')] as [string, string],
   ranges: {
     [t('views.monitor.monitor.yesterday')]: [dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day')],
@@ -157,6 +198,7 @@ const initChart = (type: ChartType) => {
       series: [],
     };
     state.chart.value.setOption(option);
+    state.chart.value.resize();  // 确保图表正确调整大小
 
     // 创建 ResizeObserver 实例
     state.observer.value = new ResizeObserver(() => {
@@ -173,11 +215,11 @@ const initChart = (type: ChartType) => {
 //结束拖拽事件
 const onDragEnd = () => {
   nextTick(() => {
-    chartOrder.value.forEach((type) => {
+    chartOrder.value.forEach((type:any) => {
       const state = chartStates[type as ChartType];
       if (state.chart.value) {
         state.chart.value.resize(); // 调整图表大小
-        // 重新设置图表选项，保留原有数据
+        // 重新设置图表选项，保留原有数
         state.chart.value.setOption({
           xAxis: { data: state.chartDataXAxisData },
           series: state.chartDataYSeriesData,
@@ -188,9 +230,9 @@ const onDragEnd = () => {
 };
 
 
-// 创建可复用的数据获取函数
+// 可复用的数据获取函数
 const fetchData = async (type: ChartType) => {
-  const state = chartStates[type];
+  const state = chartStates[type];  // 直接使用 type
   const neId = '001';
   state.tableState.loading = true;
   try {
@@ -206,9 +248,8 @@ const fetchData = async (type: ChartType) => {
       interval: 5,
     });
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
-
       state.tableState.data = res.data;
-      nextTick(()=> {
+      nextTick(() => {
         renderChart(type);
       });
     }
@@ -318,22 +359,22 @@ interface CustomSeriesOption extends Omit<LineSeriesOption, 'data'> {
 }
 // 创建可复用的图表渲染函数
 const renderChart = (type: ChartType) => {
-
   const state = chartStates[type];
-  if (state.chart.value == null ) {
+  if (state.chart.value == null) {
     return;
   }
   // 重置数据
   state.chartLegendSelected = {};
   state.chartDataXAxisData = [];
   state.chartDataYSeriesData = [];
+
   // 处理数据
-  for (const columns of state.tableColumns.value) {
-    if (['neName', 'startIndex', 'timeGroup'].includes(columns.key as string)) continue;
+  for (const column of state.tableColumns.value) {
+    if (['neName', 'startIndex', 'timeGroup'].includes(column.key as string)) continue;
     const color = generateColorRGBA();
     state.chartDataYSeriesData.push({
-      name: columns.title as string,
-      customKey: columns.key as string,
+      name: column.title as string,
+      customKey: column.key as string,
       type: 'line',
       symbol: 'none',
       sampling: 'lttb',
@@ -346,22 +387,23 @@ const renderChart = (type: ChartType) => {
       },
       data: [],
     } as CustomSeriesOption);
-    state.chartLegendSelected[columns.title as string] = true;
+    state.chartLegendSelected[column.title as string] = true;
   }
 
   const orgData = [...state.tableState.data].reverse();
   for (const item of orgData) {
     state.chartDataXAxisData.push(parseDateToStr(+item.timeGroup));
-    for (const y of state.chartDataYSeriesData) {
-      //const key = (y.emphasis as any).customKey;
-      y.data.push(+item[y.customKey as string]);
+    for (const series of state.chartDataYSeriesData) {
+      series.data.push(+item[series.customKey as string]);
     }
   }
+
   // 更新图表
   state.chart.value.setOption(
     {
       legend: { selected: state.chartLegendSelected },
-      xAxis: { data: state.chartDataXAxisData,
+      xAxis: {
+        data: state.chartDataXAxisData,
         type: 'category',
         boundaryGap: false,
       },
@@ -413,7 +455,7 @@ onMounted(async () => {
   for (const type of networkElementTypes) {
     await fetchKPITitle(type);
     initChart(type);
-    fetchData(type);
+    fetchData(type);  // 确保这行存在
   }
 
 });
@@ -437,99 +479,151 @@ onUnmounted(() => {
 <template>
   <PageContainer>
     <div class="control-row">
-      <div class="real-time-switch">
-        <Switch
-          v-model:checked="realTimeEnabled"
-          @change="handleRealTimeSwitch as any"
-        />
-        <span class="switch-label">{{ realTimeEnabled ? t('views.dashboard.cdr.realTimeDataStart') : t('views.dashboard.cdr.realTimeDataStop') }}</span>
-      </div>
+      <a-form layout="inline">
+        <a-form-item>
+          <a-switch
+            v-model:checked="realTimeEnabled"
+            @change="handleRealTimeSwitch"
+          />
+        </a-form-item>
+        <a-form-item>
+          <span class="switch-label">{{ realTimeEnabled ? t('views.dashboard.cdr.realTimeDataStart') : t('views.dashboard.cdr.realTimeDataStop') }}</span>
+        </a-form-item>
+        <!-- 这里可以添加更多的表单项 -->
+      </a-form>
     </div>
-    <draggable
-      v-model="chartOrder"
-      :animation="200"
-      item-key="type"
-      @end="onDragEnd"
-      class="row"
-      onscroll='false'
+    <GridLayout
+      v-model:layout="chartOrder"
+      :col-num="12"
+      :row-height="100"
+      :margin="[10, 10]"
+      :is-draggable="true"
+      :is-resizable="true"
+      :vertical-compact="true"
+      :use-css-transforms="true"
+      :responsive="true"
+      :prevent-collision="false"
+      @layout-updated="handleLayoutUpdated"
+      class="charts-container"
     >
-      <template #item="{element:type}">
-
-        <div class="col-lg-6 col-md=-6 col-xs-12">
-          <a-card :bordered="false" :body-style="{ marginBottom: '24px', padding: '24px'}">
-            <template #title>{{ type.toUpperCase() }}</template>
-            <template #extra>
-              <a-range-picker
-                v-model:value="(rangePicker[type as keyof RangePicker]as[string,string])"
-                :allow-clear="false"
-                bordered
-                :show-time="{ format: 'HH:mm:ss' }"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="x"
-                :placeholder="rangePicker.placeholder"
-                :ranges="rangePicker.ranges"
-                style="width: 100%"
-                @change="() => fetchData(type)"
-              ></a-range-picker>
-            </template>
-            <div class='chart' style="padding: 12px">
-              <div :ref="el => { if (el) chartStates[type as ChartType].chartDom.value = el as HTMLElement }" style="height:400px;width:100%"></div>
-            </div>
-          </a-card>
-        </div>
-
-      </template>
-    </draggable>
+      <GridItem
+        v-for="item in chartOrder"
+        :key="item.i"
+        :x="item.x"
+        :y="item.y"
+        :w="item.w"
+        :h="item.h"
+        :i="item.i"
+        :min-w="4"
+        :min-h="3"
+        :is-draggable="true"
+        :is-resizable="true"
+        :resizable-handles="['ne']"
+        drag-allow-from=".drag-handle"
+        drag-ignore-from=".no-drag"
+        class="grid-item"
+      >
+        <div class="drag-handle"></div>
+        <a-card :bordered="false" class="card-container">
+          <template #title>
+            <span class="no-drag">{{ item.i.toUpperCase() }}</span>
+          </template>
+          <template #extra>
+            <a-range-picker
+              v-model:value="rangePicker[item.i]"
+              :allow-clear="false"
+              bordered
+              :show-time="{ format: 'HH:mm:ss' }"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="x"
+              :placeholder="rangePicker.placeholder"
+              :ranges="rangePicker.ranges"
+              style="width: 100%"
+              @change="() => fetchData(item.i)"
+            ></a-range-picker>
+          </template>
+          <div class='chart'>
+            <div :ref="el => { if (el) chartStates[item.i].chartDom.value = el as HTMLElement }"></div>
+          </div>
+        </a-card>
+      </GridItem>
+    </GridLayout>
   </PageContainer>
 </template>
 
 <style lang="less" scoped>
-.chart {
+.charts-container {
   width: 100%;
-  height: 450px;
+  min-height: 600px;  // 减小最小高度
 }
 
-.sortable-ghost {
-  opacity: 0.5;
-  background: #c8ebfb;
+.grid-item {
+  overflow: visible; // 改为 visible 以确保拖拽手柄可见
+  position: relative;
 }
 
-.sortable-drag {
-  opacity: 0.8;
-  background: #f4f4f4;
-}
-
-.row {
+.card-container {
+  height: 100%;
   display: flex;
-  flex-wrap: wrap;
-  margin: -12px;
+  flex-direction: column;
 }
 
-.col-lg-6 {
-  flex: 0 0 50%;
-  max-width: 50%;
-  padding: 12px;
+:deep(.ant-card-body) {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  padding: 12px !important;
+  overflow: hidden;
+}
+
+.chart {
+  flex: 1;
+  min-height: 0;
+}
+
+.chart > div {
+  width: 100%;
+  height: 100%;
 }
 
 .control-row {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  padding: 16px;
   margin-bottom: 16px;
-  background-color: #f0f2f5;
+  background-color: #ffffff;  // 改为白色背景
   border-radius: 4px;
+  padding: 16px;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.03);  // 添加轻微阴影
+  border: 1px solid #f0f0f0;  // 添加浅色边框
 }
 
-.real-time-switch {
-  display: flex;
-  align-items: center;
+:deep(.ant-form-item) {
+  margin-bottom: 0;
+}
+
+:deep(.ant-form-item-label) {
+  font-weight: 500;  // 加粗标签文字
+  color: rgba(0, 0, 0, 0.85);  // 调整标签颜色
 }
 
 .switch-label {
   margin-left: 8px;
   font-size: 14px;
-  color: #333;
+  color: rgba(0, 0, 0, 0.65);  // 调整文字颜色
   white-space: nowrap;
 }
+
+.drag-handle {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 20px;
+  height: 20px;
+  background-color: #1890ff;
+  cursor: move;
+  z-index: 100; // 增加 z-index 确保在最上层
+}
+
+/* 可以根据需要调整卡片标题的样式 */
+:deep(.ant-card-head-title) {
+  padding-right: 25px;  /* 为拖拽手柄留出空间 */
+}
 </style>

From b4623d19e5ad6c1bdf82c2e83731e522680903a0 Mon Sep 17 00:00:00 2001
From: zhongzm <zhongzm@agt.com>
Date: Tue, 15 Oct 2024 18:26:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=85=B3=E9=94=AE=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=8B=96=E6=8B=BD=E5=9D=97=E8=AE=BE=E4=B8=BA?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=EF=BC=8C=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/perfManage/kpiKeyTarget/index.vue | 88 ++++++++++++---------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/src/views/perfManage/kpiKeyTarget/index.vue b/src/views/perfManage/kpiKeyTarget/index.vue
index 3913e2cc..d662656f 100644
--- a/src/views/perfManage/kpiKeyTarget/index.vue
+++ b/src/views/perfManage/kpiKeyTarget/index.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { DragOutlined } from '@ant-design/icons-vue';
 import { GridLayout, GridItem } from 'grid-layout-plus'
 import * as echarts from 'echarts';
 import { PageContainer } from 'antdv-pro-layout';
@@ -523,7 +524,9 @@ onUnmounted(() => {
         drag-ignore-from=".no-drag"
         class="grid-item"
       >
-        <div class="drag-handle"></div>
+        <div class="drag-handle">
+          <DragOutlined />
+        </div>
         <a-card :bordered="false" class="card-container">
           <template #title>
             <span class="no-drag">{{ item.i.toUpperCase() }}</span>
@@ -554,11 +557,11 @@ onUnmounted(() => {
 <style lang="less" scoped>
 .charts-container {
   width: 100%;
-  min-height: 600px;  // 减小最小高度
+  min-height: 600px;
 }
 
 .grid-item {
-  overflow: visible; // 改为 visible 以确保拖拽手柄可见
+  overflow: visible;
   position: relative;
 }
 
@@ -568,62 +571,73 @@ onUnmounted(() => {
   flex-direction: column;
 }
 
-:deep(.ant-card-body) {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  padding: 12px !important;
-  overflow: hidden;
-}
-
 .chart {
   flex: 1;
   min-height: 0;
-}
 
-.chart > div {
-  width: 100%;
-  height: 100%;
+  > div {
+    width: 100%;
+    height: 100%;
+  }
 }
 
 .control-row {
   margin-bottom: 16px;
-  background-color: #ffffff;  // 改为白色背景
+  background-color: #ffffff;
   border-radius: 4px;
   padding: 16px;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.03);  // 添加轻微阴影
-  border: 1px solid #f0f0f0;  // 添加浅色边框
-}
-
-:deep(.ant-form-item) {
-  margin-bottom: 0;
-}
-
-:deep(.ant-form-item-label) {
-  font-weight: 500;  // 加粗标签文字
-  color: rgba(0, 0, 0, 0.85);  // 调整标签颜色
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.03);
+  border: 1px solid #f0f0f0;
 }
 
 .switch-label {
   margin-left: 8px;
   font-size: 14px;
-  color: rgba(0, 0, 0, 0.65);  // 调整文字颜色
+  color: rgba(0, 0, 0, 0.65);
   white-space: nowrap;
 }
 
 .drag-handle {
   position: absolute;
-  top: 0;
-  right: 0;
-  width: 20px;
-  height: 20px;
-  background-color: #1890ff;
+  top: 0px;
+  right: 0px;
+  width: 24px;
+  height: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: rgba(24, 144, 255, 0.1);
+  border-radius: 4px;
   cursor: move;
-  z-index: 100; // 增加 z-index 确保在最上层
+  z-index: 100;
+  transition: background-color 0.3s;
+
+  &:hover {
+    background-color: rgba(24, 144, 255, 0.2);
+  }
 }
 
-/* 可以根据需要调整卡片标题的样式 */
-:deep(.ant-card-head-title) {
-  padding-right: 25px;  /* 为拖拽手柄留出空间 */
+:deep {
+  .ant-card-body {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    padding: 12px !important;
+    overflow: hidden;
+  }
+
+  .ant-form-item {
+    margin-bottom: 0;
+  }
+
+  .ant-form-item-label {
+    font-weight: 500;
+    color: rgba(0, 0, 0, 0.85);
+  }
+
+  .anticon {
+    font-size: 16px;
+    color: #1890ff;
+  }
 }
 </style>