From 0f1b4a52b670b38802bb01dde926de236a5e802b Mon Sep 17 00:00:00 2001
From: username <2971861643@qq.com>
Date: Mon, 8 Apr 2024 20:40:51 +0800
Subject: [PATCH 1/3] 4.8 20:40

---
 src/views/index.vue | 36 +++++++++++++++++++++++-------------
 src/views/login.vue | 11 ++++++++++-
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index d73231a..c90f97c 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -7,9 +7,18 @@
         </router-link>
       </div>
       <div class="navUser">
-        <div v-if="login" class="block"><el-avatar shape="square" :size="50" fit="cover" :src="squareUrl"></el-avatar></div>
+        <div v-if="login" class="block">
+          <el-avatar
+            shape="square"
+            :size="50"
+            fit="cover"
+            :src="squareUrl"
+          ></el-avatar>
+        </div>
         <span v-if="login">{{ userName }}</span>
-        <el-button v-else type="primary" icon="el-icon-user-solid">登陆</el-button>
+        <el-button v-else type="primary" icon="el-icon-user-solid"
+          >登陆</el-button
+        >
       </div>
     </div>
     <div class="content">
@@ -21,12 +30,12 @@
           <li v-for="(item, index) in parItem" :key="index">
             <div class="title">
               <router-link :to="item.url">
-                {{ item.title }}<br />{{ item.title2 }}<br>
+                {{ item.title }}<br />{{ item.title2 }}<br />
                 <button>查看详情</button>
               </router-link>
             </div>
             <router-link :to="item.url">
-              <img :src="item.imgs"/>
+              <img :src="item.imgs" />
             </router-link>
           </li>
         </ul>
@@ -99,12 +108,13 @@ export default {
     float: right;
     margin-right: 100px;
 
-    .block, .el-button {
+    .block,
+    .el-button {
       display: inline-block;
       margin-top: 15px;
     }
 
-    span{
+    span {
       float: right;
       line-height: 80px;
       margin-left: 10px;
@@ -157,18 +167,18 @@ export default {
     -o-transition: all 0.5s;
     transition: all 0.5s;
     animation-duration: 3s;
-  animation-name: slidein;
+    animation-name: slidein;
   }
 
   @keyframes slidein {
-  from {
-    width: 740px;
-  }
+    from {
+      width: 740px;
+    }
 
-  to {
-    width: 180px;
+    to {
+      width: 180px;
+    }
   }
-}
 
   li img {
     object-fit: cover;
diff --git a/src/views/login.vue b/src/views/login.vue
index 63d86b6..ac99a7f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -21,6 +21,14 @@
               show-password
             ></el-input>
           </el-form-item>
+          <el-form-item prop="password">
+            <el-input
+              v-model="form.affirm"
+              clearable
+              placeholder="请输入密码"
+              show-password
+            ></el-input>
+          </el-form-item>
         </el-form>
       </div>
       <div class="tool">
@@ -51,7 +59,8 @@ export default {
     return {
       form: {
         password: '',
-        username: ''
+        username: '',
+        affirm: ''
       },
       checked: false,
       rules: {

From f5705c8235d31d477a04dd3b6daf2ef4130f19b2 Mon Sep 17 00:00:00 2001
From: username <2971861643@qq.com>
Date: Mon, 8 Apr 2024 20:41:04 +0800
Subject: [PATCH 2/3] 4.8 20:41

---
 src/App.vue                                |  16 +-
 src/main.js                                |   4 +-
 src/router/index.js                        |   6 +-
 src/views/environment/journalism/index.vue |  51 +++--
 src/views/index.vue                        |  10 +-
 src/views/resource/home/index.vue          | 237 +++++++++++++++++++++
 src/views/resource/index.vue               |  13 --
 7 files changed, 294 insertions(+), 43 deletions(-)
 create mode 100644 src/views/resource/home/index.vue
 delete mode 100644 src/views/resource/index.vue

diff --git a/src/App.vue b/src/App.vue
index 34ebd29..5b266c1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,9 +1,23 @@
 <template>
   <div id="app">
     <router-view />
+    <div class="copyright">
+      <div class="aa">
+        <span>
+        广西壮族自治区南宁市武鸣区宝源路29号广西制造工程职业技术学院<br>
+        邮编：530100<br>
+        联系电话：10086
+      </span>
+      </div>
+    </div>
   </div>
 </template>
 
 <style lang="less">
-
+.copyright{
+  width: 100%;
+  height: 150px;
+  margin-top: 30px;
+  background-color: palegreen;
+}
 </style>
diff --git a/src/main.js b/src/main.js
index d72f80f..ee5d3c8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,7 +19,8 @@ import {
   MenuItem,
   Breadcrumb,
   BreadcrumbItem,
-  Avatar
+  Avatar,
+  Pagination
 } from 'element-ui'
 
 Vue.use(Avatar)
@@ -36,6 +37,7 @@ Vue.use(Menu)
 Vue.use(MenuItem)
 Vue.use(Breadcrumb)
 Vue.use(BreadcrumbItem)
+Vue.use(Pagination)
 
 Vue.config.productionTip = false
 
diff --git a/src/router/index.js b/src/router/index.js
index 1262964..7e25950 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -16,9 +16,9 @@ const routes = [
     component: () => import('../views/index.vue')
   },
   {
-    path: '/resource',
-    name: 'resource',
-    component: () => import('../views/resource')
+    path: '/resourceHome',
+    name: 'resourceHome',
+    component: () => import('../views/resource/home/index')
   },
   {
     path: '/environmental',
diff --git a/src/views/environment/journalism/index.vue b/src/views/environment/journalism/index.vue
index 4cd8cdf..1c84400 100644
--- a/src/views/environment/journalism/index.vue
+++ b/src/views/environment/journalism/index.vue
@@ -1,27 +1,27 @@
 <template>
   <div class="journalism">
     <div class="nav">
-        <el-menu
-      :default-active="activeIndex"
-      class="el-menu-demo"
-      mode="horizontal"
-      background-color="#545c64"
-      text-color="#fff"
-      active-text-color="#ffd04b"
-    >
-      <el-menu-item index="1">
-        <router-link to="/index">首页</router-link>
-      </el-menu-item>
-      <el-menu-item index="2">
-        <router-link to="/scheme">解决方案</router-link>
-      </el-menu-item>
-      <el-menu-item index="3">
-        <router-link to="/projectCase">工程案例</router-link>
-      </el-menu-item>
-      <el-menu-item index="4">
-        <router-link to="journalism">新闻资讯</router-link>
-      </el-menu-item>
-    </el-menu>
+      <el-menu
+        :default-active="activeIndex"
+        class="el-menu-demo"
+        mode="horizontal"
+        background-color="#545c64"
+        text-color="#fff"
+        active-text-color="#ffd04b"
+      >
+        <el-menu-item index="1">
+          <router-link to="/index">首页</router-link>
+        </el-menu-item>
+        <el-menu-item index="2">
+          <router-link to="/scheme">解决方案</router-link>
+        </el-menu-item>
+        <el-menu-item index="3">
+          <router-link to="/projectCase">工程案例</router-link>
+        </el-menu-item>
+        <el-menu-item index="4">
+          <router-link to="journalism">新闻资讯</router-link>
+        </el-menu-item>
+      </el-menu>
     </div>
     <!-- 轮播图 -->
     <div class="slideshow">
@@ -97,6 +97,9 @@
             </div>
           </el-tab-pane>
         </el-tabs>
+
+        <el-pagination :hide-on-single-page="true" background layout="prev, pager, next" :total="30">
+        </el-pagination>
       </div>
 
       <div class="message-right"></div>
@@ -284,7 +287,7 @@ export default {
 <style lang="less" scoped>
 .message {
   width: 1300px;
-  height: 800px;
+  height: 1430px;
   margin: 10px auto;
 
   .message-left {
@@ -322,6 +325,10 @@ export default {
         margin-top: 80px;
       }
     }
+
+    .el-pagination{
+      text-align: center;
+    }
   }
 
   .message-right {
diff --git a/src/views/index.vue b/src/views/index.vue
index c90f97c..27a0fb0 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -63,7 +63,7 @@ export default {
           title: '可持续资源开发',
           title2: '环境和社会的可持续性',
           imgs: require('@/assets/images/2.jpg'),
-          url: '/resource'
+          url: '/resourceHome'
         },
         {
           title: '生态环保',
@@ -112,6 +112,7 @@ export default {
     .el-button {
       display: inline-block;
       margin-top: 15px;
+      cursor: pointer;
     }
 
     span {
@@ -168,14 +169,17 @@ export default {
     transition: all 0.5s;
     animation-duration: 3s;
     animation-name: slidein;
+    animation-delay: 0.5s;
+    animation-delay: .5s;
+    // animation: slidein 0.5s reverse;
   }
 
   @keyframes slidein {
-    from {
+    0% {
       width: 740px;
     }
 
-    to {
+    100% {
       width: 180px;
     }
   }
diff --git a/src/views/resource/home/index.vue b/src/views/resource/home/index.vue
new file mode 100644
index 0000000..0109052
--- /dev/null
+++ b/src/views/resource/home/index.vue
@@ -0,0 +1,237 @@
+<template>
+  <div class="cleanEnergy-home">
+    <div class="nav">
+      <div class="nav-left">
+        <h2>可持续资源开发</h2>
+      </div>
+      <div class="nav-right">
+        <ul>
+          <li>首页</li>
+          <li>关于</li>
+          <li>服务</li>
+          <li>项目</li>
+        </ul>
+      </div>
+    </div>
+    <div class="slideshow">
+
+    </div>
+    <div class="row">
+      <div class="row-item" v-for="(item, index) in rowItem" :key="index">
+          {{ item.title }}
+      </div>
+    </div>
+
+    <div class="row2">
+      <div class="row2-img">
+        <img src="../../../assets/images/2.jpg" alt="">
+      </div>
+      <div class="row2-content">
+        basbs
+      </div>
+    </div>
+
+    <div class="title">
+      <h1>世界可再生能源的先驱</h1>
+    </div>
+
+    <div class="row3">
+      <div class="row3-item" v-for="(item, index) in rowItem3" :key="index">
+          {{ item.title }}
+      </div>
+    </div>
+
+    <div class="row4">
+      <div class="row4-img">
+        <img src="../../../assets/images/2.jpg" alt="">
+      </div>
+      <div class="row4-content">
+        basbs
+      </div>
+    </div>
+
+    <div class="title">
+      <h1>最新的太阳能电池板可再生能源项目</h1>
+    </div>
+
+    <div class="row3">
+      <div class="row3-item" v-for="(item, index) in rowItem3" :key="index">
+          {{ item.title }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'cleanEnergyHome',
+  data () {
+    return {
+      rowItem: [
+        {
+          title: 1
+        },
+        {
+          title: 2
+        },
+        {
+          title: 3
+        },
+        {
+          title: 4
+        }
+      ],
+      rowItem3: [
+        {
+          title: 1
+        },
+        {
+          title: 2
+        },
+        {
+          title: 3
+        },
+        {
+          title: 4
+        },
+        {
+          title: 3
+        },
+        {
+          title: 4
+        }
+      ]
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.cleanEnergy-home {
+  .nav {
+    width: 100%;
+    height: 75px;
+    background-color: #ffffff;
+
+    .nav-left{
+      width: 220px;
+      height: 75px;
+      border-right: 1px solid #b4b4b4;
+      float: left;
+      line-height: 75px;
+      margin-left: 20px;
+
+      h2{
+        color: #32c36c;
+        cursor: pointer;
+      }
+    }
+
+    .nav-right{
+      float: right;
+      margin-right: 300px;
+
+      ul{
+        list-style: none;
+
+        li{
+          float: left;
+          line-height: 75px;
+          margin-left: 35px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .slideshow{
+    width: 100%;
+    height: 825px;
+    background-color: paleturquoise;
+  }
+
+  .row{
+    width: 1320px;
+    height: 210px;
+    border: 1px solid black;
+    margin: 50px auto;
+
+    .row-item{
+      width: 330px;
+      height: 210px;
+      background-color: pink;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      float: left;
+    }
+  }
+
+  .row2{
+    width: 100%;
+    height: 620px;
+    background-color: palegoldenrod;
+
+    .row2-img{
+      width: 50%;
+      height: 620px;
+      float: left;
+
+      img{
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .row2-content{
+      float: left;
+    }
+  }
+
+  .title{
+    width: 100%;
+    height: 200px;
+
+    h1{
+      line-height: 200px;
+      text-align: center;
+    }
+  }
+
+  .row3{
+    width: 1350px;
+    height: 1055px;
+    margin: auto;
+
+    .row3-item{
+      width: 435px;
+      height: 504px;
+      background-color: cadetblue;
+      display: inline-block;
+      margin:15px 0 0 15px ;
+    }
+  }
+
+  .row4{
+    width: 100%;
+    height: 620px;
+    margin-top: 50px;
+    background-color: palegoldenrod;
+
+    .row4-img{
+      width: 50%;
+      height: 620px;
+      float: right;
+
+      img{
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .row4-content{
+      float: left;
+    }
+  }
+}
+</style>
diff --git a/src/views/resource/index.vue b/src/views/resource/index.vue
deleted file mode 100644
index 538d91a..0000000
--- a/src/views/resource/index.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  <div>资源开发</div>
-</template>
-
-<script>
-export default {
-  name: 'resouRce'
-}
-</script>
-
-<style>
-
-</style>

From f3467ea1e1af6f19780782de8a7ebdb792bcc538 Mon Sep 17 00:00:00 2001
From: username <2971861643@qq.com>
Date: Tue, 9 Apr 2024 20:20:05 +0800
Subject: [PATCH 3/3] 4.9,20.19

---
 src/components/resourceHome/homeIndex.vue     | 15 ++++++++++
 .../{ => slideshow}/SeamlessCarousel.vue      |  0
 .../{ => slideshow}/environmentCarousel.vue   |  0
 src/views/environment/journalism/index.vue    |  2 +-
 src/views/environment/scheme/index.vue        |  2 +-
 src/views/resource/home/index.vue             | 29 ++++++-------------
 6 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 src/components/resourceHome/homeIndex.vue
 rename src/components/{ => slideshow}/SeamlessCarousel.vue (100%)
 rename src/components/{ => slideshow}/environmentCarousel.vue (100%)

diff --git a/src/components/resourceHome/homeIndex.vue b/src/components/resourceHome/homeIndex.vue
new file mode 100644
index 0000000..92db409
--- /dev/null
+++ b/src/components/resourceHome/homeIndex.vue
@@ -0,0 +1,15 @@
+<template>
+  <div class="title">
+  </div>
+</template>
+
+<script>
+export default {}
+</script>
+
+<style lang="less" scoped>
+  .title{
+    width: 100%;
+    height: 200px;
+  }
+</style>
diff --git a/src/components/SeamlessCarousel.vue b/src/components/slideshow/SeamlessCarousel.vue
similarity index 100%
rename from src/components/SeamlessCarousel.vue
rename to src/components/slideshow/SeamlessCarousel.vue
diff --git a/src/components/environmentCarousel.vue b/src/components/slideshow/environmentCarousel.vue
similarity index 100%
rename from src/components/environmentCarousel.vue
rename to src/components/slideshow/environmentCarousel.vue
diff --git a/src/views/environment/journalism/index.vue b/src/views/environment/journalism/index.vue
index e5dcd8f..ea65b5a 100644
--- a/src/views/environment/journalism/index.vue
+++ b/src/views/environment/journalism/index.vue
@@ -98,7 +98,7 @@
 </template>
 
 <script>
-import environmentCarousel from '@/components/environmentCarousel.vue'
+import environmentCarousel from '@/components/slideshow/environmentCarousel.vue'
 export default {
   name: 'journaLism',
   components: {
diff --git a/src/views/environment/scheme/index.vue b/src/views/environment/scheme/index.vue
index 56c36f0..09a9244 100644
--- a/src/views/environment/scheme/index.vue
+++ b/src/views/environment/scheme/index.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import environmentCarousel from '@/components/environmentCarousel.vue'
+import environmentCarousel from '@/components/slideshow/environmentCarousel.vue'
 export default {
   name: 'HoMe',
   components: {
diff --git a/src/views/resource/home/index.vue b/src/views/resource/home/index.vue
index c82008d..d7fb014 100644
--- a/src/views/resource/home/index.vue
+++ b/src/views/resource/home/index.vue
@@ -13,16 +13,17 @@
         </ul>
       </div>
     </div>
-    <!-- <div class="slideshow">
 
-    </div> -->
     <seamless-carousel />
+
     <div class="row">
       <div class="row-item" v-for="(item, index) in rowItem" :key="index">
           {{ item.title }}
       </div>
     </div>
 
+    <homeIndex/>
+
     <div class="row2">
       <div class="row2-img">
         <img src="../../../assets/images/2.jpg" alt="">
@@ -32,9 +33,7 @@
       </div>
     </div>
 
-    <div class="title">
-      <h1>世界可再生能源的先驱</h1>
-    </div>
+    <homeIndex/>
 
     <div class="row3">
       <div class="row3-item" v-for="(item, index) in rowItem3" :key="index">
@@ -51,9 +50,7 @@
       </div>
     </div>
 
-    <div class="title">
-      <h1>最新的太阳能电池板可再生能源项目</h1>
-    </div>
+    <homeIndex/>
 
     <div class="row3">
       <div class="row3-item" v-for="(item, index) in rowItem3" :key="index">
@@ -64,11 +61,13 @@
 </template>
 
 <script>
-import SeamlessCarousel from '@/components/SeamlessCarousel.vue'
+import SeamlessCarousel from '@/components/slideshow/SeamlessCarousel.vue'
+import homeIndex from '@/components/resourceHome/homeIndex.vue'
 export default {
   name: 'cleanEnergyHome',
   components: {
-    SeamlessCarousel
+    SeamlessCarousel,
+    homeIndex
   },
   data () {
     return {
@@ -187,16 +186,6 @@ export default {
     }
   }
 
-  .title{
-    width: 100%;
-    height: 200px;
-
-    h1{
-      line-height: 200px;
-      text-align: center;
-    }
-  }
-
   .row3{
     width: 1350px;
     height: 1055px;