Browse Source

修改1.6版本需求

1. 报告模板列表,每个模板需要明显一些
2. 模板更新时间不会随着修改保存变化,一直显示原来的这个时间
3. 报告时间段字段中间加“至”字
4. 我的报告列表页面每个报告的背景颜色调整
5. 屏幕变小时,公司名称比较长时,后面的数量就会另取一行
Kevin Jiang 2 years ago
parent
commit
51a3d4720c

+ 3 - 8
src/views/RouteView.vue

@@ -32,8 +32,6 @@ watch(
         <Transition name="slide-fade">
           <img src="@/assets/logo.png" width="50" v-if="collapsed" />
           <img src="@/assets/logo.png" width="120" v-else />
-          <!-- <Logo style="color: #0079C2" width="50px" v-if="collapsed" /> -->
-          <!-- <Logo style="color: #0079C2" width="120px" v-else /> -->
         </Transition>
       </div>
       <NavMenu class="sider-nav" />
@@ -62,6 +60,9 @@ watch(
   .main-content {
     background-color: #fff;
     border-left: 1px solid #f3f3f3;
+    min-width: 800px;
+    padding: 20px 40px;
+    padding-bottom: 60px;
   }
 
   .sider-nav-bar-wrap {
@@ -76,11 +77,5 @@ watch(
       padding-bottom: 50px;
     }
   }
-
-  .main-content {
-    min-width: 800px;
-    padding: 20px 40px;
-    padding-bottom: 60px;
-  }
 }
 </style>

+ 16 - 0
src/views/report/ReportListView.vue

@@ -222,6 +222,22 @@ onMounted(() => {
         margin-top: 0;
       }
     }
+
+    :deep(.ant-card) {
+      background-color: #f5f5f5;
+
+      .ant-card-head-title {
+        font-size: 1.2em;
+      }
+
+      .ant-card-body p {
+        margin-bottom: 0.5em;
+      }
+
+      &.ant-card-bordered {
+        border: 1px solid #d0d0d0;
+      }
+    }
   }
 
   .pagination-wrap {

+ 10 - 2
src/views/report/components/dynamic-meta/ReportMetaDateRangeInput.vue

@@ -16,9 +16,17 @@ const props = defineProps({
 type RangeValue = [Dayjs, Dayjs];
 
 const value = ref<RangeValue>();
+// 日期连接字符串
+const concatChar = ' 至 ';
 
 onMounted(() => {
-  const [from, to] = props.data.value.split(' ');
+  const v = props.data.value;
+  let from = '', to = '';
+  if (v.includes(concatChar)) {
+    [from, to] = v.split(concatChar);
+  } else {
+    [from, to] = props.data.value.split(' ');
+  }
   const dateFrom = dayjs(from);
   const dateTo = dayjs(to);
   if (dateFrom.isValid() && dateTo.isValid()) {
@@ -35,7 +43,7 @@ function onNameChange(e: InputEvent) {
 }
 
 function onValueChange(_: Dayjs | string, dateString: [string, string]) {
-  change(props.data.name, dateString.join(' '));
+  change(props.data.name, dateString.join(concatChar));
 }
 
 function change(name: string, value: string) {

+ 2 - 2
src/views/report/components/report-list/CompanySelectItem.vue

@@ -37,10 +37,10 @@ function onChange() {
 
 <template>
   <a-row type="flex">
-    <a-col :flex="1">
+    <a-col :span="22">
       <a-checkbox v-model:checked="checked" @change="onChange">{{ data.label }}</a-checkbox>
     </a-col>
-    <a-col>
+    <a-col :span="2">
       {{ data.tail }}
     </a-col>
   </a-row>

+ 1 - 1
src/views/report/components/report-list/ReportItem.vue

@@ -31,7 +31,7 @@ function onDelete(id: number) {
 </script>
 
 <template>
-  <a-card size="small">
+  <a-card hoverable size="small">
     <template #title>
       <RouterLink class="title-link" :to="{ name: 'ReportEditor', params: { id: data.id } }">
         <span class="text-black"> {{ serialNumber }}. </span>

+ 17 - 1
src/views/reportTemplate/ReportTemplateListView.vue

@@ -88,7 +88,7 @@ onMounted(() => {
   </div>
   <div class="templates-wrap">
     <SpinComponent :spinning="loading">
-      <a-card v-for="(item, index) in templates" :key="index" :title="item.name" class="template-item">
+      <a-card hoverable v-for="(item, index) in templates" :key="index" :title="item.name" class="template-item">
         <template #extra>
           <a-button type="link" @click="onCreateReport(item.id)">使用模板创建报告</a-button>
           <RouterLink :to="{ name: 'ReportTemplateEditor', params: { id: item.id }}">编辑</RouterLink>
@@ -132,6 +132,22 @@ onMounted(() => {
       margin-top: 0;
     }
   }
+
+  :deep(.ant-card) {
+    background-color: #f5f5f5;
+
+    .ant-card-head-title {
+      font-size: 1.2em;
+    }
+
+    .ant-card-body p {
+      margin-bottom: 0.5em;
+    }
+
+    &.ant-card-bordered {
+      border: 1px solid #d0d0d0;
+    }
+  }
 }
 
 .pagination-wrap {