Merge remote-tracking branch 'origin/master'

src/views/Home/Index.vue

@@ -1,70 +1,77 @@
 <template>
   <div>
-    <el-card shadow="never">
+    <el-card shadow="never" style="margin-bottom: 10px;height: 300px">
-      <el-skeleton :loading="loading" animated>
+      <el-carousel :interval="4000" type="card" height="300px" motion-blur>
-        <el-row :gutter="16" justify="space-between">
+        <el-carousel-item v-for="item in image" :key="item.id">
-          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+          <el-image style="width: 100%; height: 100%" :src="item.src" alt="无图片" :title="item.name"/>
-            <div class="flex items-center">
+        </el-carousel-item>
-              <el-avatar :src="avatar" :size="70" class="mr-16px">
+      </el-carousel>
-                <img src="@/assets/imgs/avatar.gif" alt="" />
-              </el-avatar>
-              <div>
-                <div class="text-20px">
-                  {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
-                </div>
-                <div class="mt-10px text-14px text-gray-500">
-                  {{ t('workplace.toady') }}，20℃ - 32℃！
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
-            <div class="h-70px flex items-center justify-end lt-sm:mt-10px">
-              <div class="px-8px text-right">
-                <div class="mb-16px text-14px text-gray-400">{{ t('workplace.project') }}</div>
-                <CountTo
-                  class="text-20px"
-                  :start-val="0"
-                  :end-val="totalSate.project"
-                  :duration="2600"
-                />
-              </div>
-              <el-divider direction="vertical" />
-              <div class="px-8px text-right">
-                <div class="mb-16px text-14px text-gray-400">{{ t('workplace.toDo') }}</div>
-                <CountTo
-                  class="text-20px"
-                  :start-val="0"
-                  :end-val="totalSate.todo"
-                  :duration="2600"
-                />
-              </div>
-              <el-divider direction="vertical" border-style="dashed" />
-              <div class="px-8px text-right">
-                <div class="mb-16px text-14px text-gray-400">{{ t('workplace.access') }}</div>
-                <CountTo
-                  class="text-20px"
-                  :start-val="0"
-                  :end-val="totalSate.access"
-                  :duration="2600"
-                />
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-skeleton>
     </el-card>
   </div>
 
   <el-row class="mt-8px" :gutter="8" justify="space-between">
     <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-8px">
-      <el-card shadow="never" style="margin-bottom: 10px; margin-top: 8px">
+      <el-card shadow="never" style="margin-bottom: 10px; margin-top: 10px">
-        <el-carousel :interval="4000" type="card" height="200px">
+        <el-skeleton :loading="loading" animated>
-          <el-carousel-item v-for="item in image" :key="item.id">
+          <el-row :gutter="16" justify="space-between">
-            <el-image style="width: 100%; height: 100%" :src="item.src" alt="无图片" :title="item.name"/>
+            <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
-          </el-carousel-item>
+              <div class="flex items-center">
-        </el-carousel>
+                <el-avatar :src="avatar" :size="70" class="mr-16px">
+                  <img src="@/assets/imgs/avatar.gif" alt="" />
+                </el-avatar>
+                <div>
+                  <div class="text-20px">
+                    {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
+                  </div>
+                  <div class="mt-10px text-14px text-gray-500">
+                    {{ t('workplace.toady') }}，20℃ - 32℃！
+                  </div>
+                </div>
+              </div>
+            </el-col>
+            <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+              <div class="h-70px flex items-center justify-end lt-sm:mt-10px">
+                <div class="px-8px text-right">
+                  <div class="mb-16px text-14px text-gray-400">{{ t('workplace.project') }}</div>
+                  <CountTo
+                    class="text-20px"
+                    :start-val="0"
+                    :end-val="totalSate.project"
+                    :duration="2600"
+                  />
+                </div>
+                <el-divider direction="vertical" />
+                <div class="px-8px text-right">
+                  <div class="mb-16px text-14px text-gray-400">{{ t('workplace.toDo') }}</div>
+                  <CountTo
+                    class="text-20px"
+                    :start-val="0"
+                    :end-val="totalSate.todo"
+                    :duration="2600"
+                  />
+                </div>
+                <el-divider direction="vertical" border-style="dashed" />
+                <div class="px-8px text-right">
+                  <div class="mb-16px text-14px text-gray-400">{{ t('workplace.access') }}</div>
+                  <CountTo
+                    class="text-20px"
+                    :start-val="0"
+                    :end-val="totalSate.access"
+                    :duration="2600"
+                  />
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+        </el-skeleton>
       </el-card>
+<!--      <el-card shadow="never" style="margin-bottom: 10px; margin-top: 8px">-->
+<!--        <el-carousel :interval="4000" type="card" height="200px">-->
+<!--          <el-carousel-item v-for="item in image" :key="item.id">-->
+<!--            <el-image style="width: 100%; height: 100%" :src="item.src" alt="无图片" :title="item.name"/>-->
+<!--          </el-carousel-item>-->
+<!--        </el-carousel>-->
+<!--      </el-card>-->
       <el-card shadow="never">
         <template #header>
           <div class="h-3 flex justify-between">
@@ -135,12 +142,65 @@
           </el-row>
         </el-skeleton>
       </el-card>
+      <el-card shadow="never" style="margin-bottom: 10px">
+        <template #header>
+          <div class="h-3 flex justify-between">
+            <!--            <span>{{ t('workplace.shortcutOperation') }}</span>-->
+            <span>完成项目</span>
+          </div>
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <el-row>
+            <!--            <el-col v-for="item in shortcut" :key="`team-${item.name}`" :span="8" class="mb-8px">-->
+            <el-col>
+              <div class="flex items-center">
+                <!--                <Icon :icon="item.icon" class="mr-8px" />-->
+                <!--                <el-link type="default" :underline="false" @click="setWatermark(item.name)">-->
+                <!--&lt;!&ndash;                  {{ item.name }}&ndash;&gt;-->
+                <!--                  Test-->
+                <!--                </el-link>-->
+                <el-table
+                  :data="pjList"
+                  stripe
+                  style="width:100%"
+                  height="300"
+                ><el-table-column
+                  fixed
+                  prop="pjEtime"
+                  label="完成日期"
+                  style="width: 20%"
+                />
+                  <el-table-column
+                    prop="pjName"
+                    label="标题"
+                    style="width: 30%"
+                  />
+                  <el-table-column
+                    prop="pjType"
+                    label="类别"
+                    style="width: 20%"
+                  />
+                  <el-table-column
+                    prop="pjDept"
+                    label="部门"
+                    style="width: 20%"/>
+                  <el-table-column
+                    prop="pjNumber"
+                    label="人员"
+                    style="width: 10%"
+                  />
+                </el-table>
+              </div>
+            </el-col>
+          </el-row>
+        </el-skeleton>
+      </el-card>
     </el-col>
 
 
 
     <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px">
-      <el-card shadow="never" class="mt-8px">
+      <el-card shadow="never" class="mt-8px" style="margin-bottom: 10px">
         <template #header>
           <div class="h-3 flex justify-between">
             <span>{{ t('workplace.notice') }}</span>
@@ -150,9 +210,9 @@
         <el-skeleton :loading="loading" animated>
           <div v-for="(item, index) in notice" :key="`dynamics-${index}`">
             <div class="flex items-center">
-              <el-avatar :src="avatar" :size="35" class="mr-16px">
+<!--              <el-avatar :src="avatar" :size="35" class="mr-16px">-->
-                <img src="@/assets/imgs/avatar.gif" alt="" />
+<!--                <img src="@/assets/imgs/avatar.gif" alt="" />-->
-              </el-avatar>
+<!--              </el-avatar>-->
               <div>
                 <div class="text-14px">
                   <Highlight :keys="item.keys.map((v) => t(v))">
@@ -168,59 +228,6 @@
           </div>
         </el-skeleton>
       </el-card>
-      <el-card shadow="never" style="margin-bottom: 10px">
-        <template #header>
-          <div class="h-3 flex justify-between">
-<!--            <span>{{ t('workplace.shortcutOperation') }}</span>-->
-            <span>完成项目</span>
-          </div>
-        </template>
-        <el-skeleton :loading="loading" animated>
-          <el-row>
-<!--            <el-col v-for="item in shortcut" :key="`team-${item.name}`" :span="8" class="mb-8px">-->
-            <el-col>
-              <div class="flex items-center">
-<!--                <Icon :icon="item.icon" class="mr-8px" />-->
-<!--                <el-link type="default" :underline="false" @click="setWatermark(item.name)">-->
-<!--&lt;!&ndash;                  {{ item.name }}&ndash;&gt;-->
-<!--                  Test-->
-<!--                </el-link>-->
-              <el-table
-                :data="pjList"
-                stripe
-                style="width:100%"
-                height="300"
-                ><el-table-column
-                fixed
-                prop="pjEtime"
-                label="完成日期"
-                style="width: 20%"
-              />
-                <el-table-column
-                  prop="pjName"
-                  label="标题"
-                  style="width: 30%"
-                />
-                <el-table-column
-                  prop="pjType"
-                  label="类别"
-                  style="width: 20%"
-                />
-                <el-table-column
-                  prop="pjDept"
-                  label="部门"
-                  style="width: 20%"/>
-                <el-table-column
-                  prop="pjNumber"
-                  label="人员"
-                  style="width: 10%"
-                />
-              </el-table>
-              </div>
-            </el-col>
-          </el-row>
-        </el-skeleton>
-      </el-card>
       <el-card shadow="never">
         <template #header>
           <div class="h-3 flex justify-between">
@@ -402,25 +409,29 @@ let notice = reactive<Notice[]>([])
 const getNotice = async () => {
   const data = [
     {
-      title: '系统支持 JDK 8/17/21，Vue 2/3',
+      title: '2024年4月7日，罗平县生态环境保护综合行政执法大队对你单位进行了调查，发现你单位实施了以下生态环境违法行为',
+      // title: '系统支持 JDK 8/17/21，Vue 2/3',
       type: '通知',
       keys: ['通知', '8', '17', '21', '2', '3'],
       date: new Date()
     },
     {
-      title: '后端提供 Spring Boot 2.7/3.2 + Cloud 双架构',
+      title: '2024年4月7日，罗平县生态环境保护综合行政执法大队对你单位进行了调查，发现你单位实施了以下生态环境违法行为',
+      // title: '后端提供 Spring Boot 2.7/3.2 + Cloud 双架构',
       type: '公告',
       keys: ['公告', 'Boot', 'Cloud'],
       date: new Date()
     },
     {
-      title: '全部开源，个人与企业可 100% 直接使用，无需授权',
+      title: '2024年4月7日，罗平县生态环境保护综合行政执法大队对你单位进行了调查，发现你单位实施了以下生态环境违法行为',
+      // title: '全部开源，个人与企业可 100% 直接使用，无需授权',
       type: '通知',
       keys: ['通知', '无需授权'],
       date: new Date()
     },
     {
-      title: '国内使用最广泛的快速开发平台，超 300+ 人贡献',
+      title: '2024年4月7日，罗平县生态环境保护综合行政执法大队对你单位进行了调查，发现你单位实施了以下生态环境违法行为',
+      // title: '国内使用最广泛的快速开发平台，超 300+ 人贡献',
       type: '公告',
       keys: ['公告', '最广泛'],
       date: new Date()