Pārlūkot izejas kodu

处理资金曲线时间问题
修改页面缓存问题
收集信息页面添加颜色

DESKTOP-NE65RNK\Citrus_limon 1 gadu atpakaļ
vecāks
revīzija
d131cdfbee

+ 3 - 0
src/assets/css/index.scss

@@ -12,6 +12,9 @@
 .danger-color{
   color: var(--danger-color);
 }
+.primary-color{
+  color: var(--primary-color);
+}
 * {
   padding: 0;
   margin: 0;

+ 2 - 3
src/components/PageLayout/Layout.vue

@@ -53,9 +53,6 @@ const pageData = ref<PageInfo>({ avatarUrl: generateAvatar("") });
 const menuCollapse = ref<boolean>(false);
 const keepAliveList = ref<Array<any>>([]);
 
-let tagList = JSON.parse(window.sessionStorage.getItem("_4L_TAG_LIST") || "[]");
-keepAliveList.value.push(...tagList.map((item: any) => item.templateName));
-
 const pageInfo = () => {
   get_client_info({}, (data: any) => {
     if (data.code == 200) {
@@ -94,6 +91,8 @@ const handleResize = () => {
   menuCollapse.value = document.body.offsetWidth <= 1500;
 };
 onMounted(() => {
+  let tagList = JSON.parse(window.sessionStorage.getItem("_4L_TAG_LIST") || "[]");
+  keepAliveList.value.push(...tagList.map((item: any) => item.templateName));
   menuCollapse.value = document.body.offsetWidth <= 1500;
   window.addEventListener("resize", handleResize);
 });

+ 14 - 6
src/views/debug/deeebug/index.vue

@@ -13,7 +13,11 @@
         </lay-form>
       </div>
       <div>
-        <lay-table :page="tablePage" :columns="columns" resize :data-source="dataSource" :loading="pageConfig.loading" />
+        <lay-table :page="tablePage" :columns="columns" resize :data-source="dataSource" :loading="pageConfig.loading">
+          <template v-slot:changeU="{ row }">
+            <span :class="row.changeU * 1 > 0 ? 'primary-color' : 'danger-color'">{{ row.changeU }}</span>
+          </template>
+        </lay-table>
       </div>
     </template>
   </lay-card>
@@ -35,7 +39,7 @@ interface FormItem {
   startTime?: Number;
   endTime?: Number;
 }
-const pageParams: FormItem = reactive({ startTime: +new Date() - 1000 * 60 * 60 * 4, endTime: +new Date() });
+let pageParams: FormItem = reactive({});
 
 interface TablePage {
   current: number;
@@ -48,7 +52,8 @@ const columns = ref([
   { title: "币对", key: "pair" },
   { title: "变动前", key: "beforeU" },
   { title: "变动后", key: "afterU" },
-  { title: "盈亏", key: "changeU" },
+  { title: "盈亏", key: "changeU", customSlot: "changeU" },
+  { title: "参数", width: "200px", key: "jsonParams", ellipsisTooltip: true },
   { title: "创建时间", key: "creationTime" },
 ]);
 let dataSource = ref<any>([]);
@@ -56,13 +61,16 @@ let dataSource = ref<any>([]);
 // 请求数据列表
 const getPageInfo = () => {
   //   if (isSearch) pageParams.pageNum = 1;
+  pageParams = { startTime: +new Date() - 1000 * 60 * 60 * 4, endTime: +new Date() };
   pageConfig.loading = true;
   get_acquire_log(pageParams, (data: any) => {
     pageConfig.loading = false;
     if (data.code == 200) {
-      dataSource.value = [...data.data["+"], ...data.data["-"]].sort((a, b) => {
-        return +new Date(b.creationTime) - +new Date(a.creationTime);
-      });
+      dataSource.value = [
+        ...[...data.data["+"], ...data.data["-"]].sort((a, b) => {
+          return +new Date(b.creationTime) - +new Date(a.creationTime);
+        }),
+      ];
       //   tablePage.total = dataSource.value.length;
     }
   });

+ 8 - 4
src/views/statistic/balance_user/index.vue

@@ -127,18 +127,22 @@ const handleBalanceData = (data: any) => {
 };
 
 const handleRangeTime = (type: number) => {
+  const currentTime = +dayjs();
+  const diffTimestamp = +dayjs(currentTime).hour(10).minute(0).second(0).millisecond(0) - currentTime;
+  let timestamp = diffTimestamp <= 0 ? currentTime : currentTime - 1000 * 60 * 60 * 10;
+
   switch (type) {
     case 1:
-      pageParams.rangeTime = [`${dayjs().hour(10).minute(0).second(0).millisecond(0)}`, `${dayjs()}`];
+      pageParams.rangeTime = [`${dayjs(timestamp).hour(10).minute(0).second(0).millisecond(0)}`, `${dayjs()}`];
       break;
     case 2:
-      pageParams.rangeTime = [`${dayjs().isoWeekday(1).hour(10).minute(0).second(0).millisecond(0)}`, `${dayjs()}`];
+      pageParams.rangeTime = [`${dayjs(timestamp).isoWeekday(1).hour(10).minute(0).second(0).millisecond(0)}`, `${dayjs()}`];
       break;
     case 3:
-      pageParams.rangeTime = [`${dayjs().startOf("month").hour(10).minute(0).second(0).millisecond(0)}`, `${dayjs()}`];
+      pageParams.rangeTime = [`${dayjs(timestamp).startOf("month").hour(10).minute(0).second(0).millisecond(0)}`, `${dayjs()}`];
       break;
     case 4:
-      let upMonthTime = +dayjs().startOf("month") - 1;
+      let upMonthTime = +dayjs(timestamp).startOf("month") - 1;
       pageParams.rangeTime = [`${dayjs(upMonthTime).startOf("month").hour(10).minute(0).second(0).millisecond(0)}`, `${dayjs().startOf("month").hour(10).minute(0).second(0).millisecond(0)}`];
       break;
   }