边框

src/components/Pagination/index.vue

@@ -14,8 +14,11 @@
 
 <script>
 export default {
+  name:'Pagination',
   data() {
-    return {};
+    return {
+      currentPage:5
+    };
   },
   methods:{
      handleSizeChange(val) {

src/layout/components/AppMain.vue

@@ -44,7 +44,7 @@ export default {
   width: 100%;
   overflow: hidden;
   background: #ffffff;
-  padding: 10px 20px;
+  /* padding: 10px 20px; */
 }
 .fixed-header + .app-main {
   padding-top: 26px;

src/views/currentSystem/companyDynamics/companyDynamics.vue

@@ -37,7 +37,6 @@ export default {
   components: {},
   data() {
     return {
-      currentPage: 5,
     };
   },
   methods:{

src/views/currentSystem/dashboard/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 首页 -->
     <div class="block">
-      <el-carousel trigger="click" autoplay :interval="3000" :arrow='never'>
+      <el-carousel trigger="click" autoplay :interval="3000" arrow="never">
         <el-carousel-item v-for="item in urlList" :key="item.id">
           <img :src="item.bannerUrl" alt="" width="100%" />
         </el-carousel-item>
@@ -11,50 +11,68 @@
 
     <div class="announce">
       <div class="announceL">
-        <div class="box">
-
-        </div>
+        <div class="box"></div>
       </div>
       <div class="announceR">
         <el-tabs v-model="activeName" @tab-click="handleClick" stretch>
-          <el-tab-pane label="服务网点" name="first" :style="{fontSize:'25px'}">
-            <p><span class="iconfont iconwushuichulichang2"> </span> 马边彝族自治县民建镇东光大道435号</p>
-            <p><span class="iconfont iconcbjhgl1"> </span> 周一至周六8:30—17:00（法定节假日除外）</p>
-            <p> 028-2565458</p>
+          <el-tab-pane
+            label="服务网点"
+            name="first"
+            :style="{ fontSize: '25px' }"
+          >
+            <p>
+              <span class="iconfont iconwushuichulichang2"> </span>
+              马边彝族自治县民建镇东光大道435号
+            </p>
+            <p>
+              <span class="iconfont iconcbjhgl1"> </span>
+              周一至周六8:30—17:00（法定节假日除外）
+            </p>
+            <p class="p3">
+              <span class="iconfont iconhujiao"></span> 028-2565458
+            </p>
           </el-tab-pane>
-          <el-tab-pane label="停水通知" name="second"><p>停水通知</p></el-tab-pane>
+          <el-tab-pane label="停水通知" name="second"
+            ><p>停水通知</p></el-tab-pane
+          >
         </el-tabs>
       </div>
     </div>
-    <div class="outLink">
-      https://www.h2o-china.com
-    </div>
+    <div class="outLink">https://www.h2o-china.com</div>
     <div class="outWork">
       <div class="outWorkL">
         <h3>--------- 信息公开 ---------</h3>
+        <div class="outWorkL_down">
+          <div class="outWorkL_down_l">
+            <div class="outLbox">公司动态</div>
+            <div class="outLbox">政策法规</div>
+            <div class="outLbox">办事公开</div>
+          </div>
+          <div class="outWorkL_down_r">
+            <ul>
+            <li>
+                <div class="l">20220308服务公告</div>
+                <div class="r">2022.03.08</div>
+            </li>
+            <li>
+                <div class="l">20220308服务公告</div>
+                <div class="r">2022.03.08</div>
+            </li>
+            <li>
+                <div class="l">20220308服务公告</div>
+                <div class="r">2022.03.08</div>
+            </li>
+            <li>
+                <div class="l">20220308服务公告</div>
+                <div class="r">2022.03.08</div>
+            </li>
+        </ul>
+          </div>
+        </div>
       </div>
       <div class="outWorkR"></div>
     </div>
-    <!-- 回到顶部 -->
-    <!-- <el-backtop target=".page-component__scroll .el-scrollbar__wrap" :bottom="100">
-    <div
-      :style="{
-        height: '100%',
-        width: '100%',
-        backgroundColor: '#f2f5f6',
-        boxShadow: '0 0 6px rgba(0,0,0, .12)',
-        textAlign: 'center',
-        lineHeight: '40px',
-        color: '#1989fa',
-      }"
-    >
-      UP
-    </div>
-  </el-backtop> -->
   </div>
-
-
-  
 </template>
 
 <script>
@@ -67,10 +85,10 @@ export default {
     return {
       urlList: [
         { bannerUrl: require("./images/u6.jpg"), id: 1 },
-        { bannerUrl: require("./images/u6.jpg"), id: 1 },
-        { bannerUrl: require("./images/u6.jpg"), id: 1 },
+        { bannerUrl: require("./images/u6.jpg"), id: 2 },
+        { bannerUrl: require("./images/u6.jpg"), id: 3 },
       ],
-      activeName: 'first'
+      activeName: "first",
     };
   },
   computed: {
@@ -81,8 +99,8 @@ export default {
   mounted() {},
   methods: {
     handleClick(tab, event) {
-        console.log(tab, event);
-      }
+      console.log(tab, event);
+    },
   },
 };
 </script>
@@ -92,39 +110,103 @@ export default {
   width: 100%;
   background-size: 100% 100%;
   padding: 0;
+  // margin: 90px 0 180px;
 }
-.announce{
+.announce {
   display: flex;
   justify-content: space-between;
   // align-items: center;
   margin-top: 40px;
   padding: 0 30px;
 }
-.announceL{
+.announceL {
   flex: 1;
   height: 400px;
   border: 1px solid #000;
 }
-.announceR{
+.announceR {
   width: 60%;
   font-size: 28px;
   margin-left: 30px;
+  .p3 {
+    font-size: 69px;
+    span {
+      font-size: 69px;
+    }
+  }
 }
-/deep/.el-tabs__item{
+/deep/.el-tabs__item {
   font-size: 28px;
 }
-.outLink{
+.outLink {
   font-size: 26px;
   height: 127px;
   line-height: 127px;
   text-align: center;
   margin: 20px 30px;
+  border: 1px solid #000;
 }
-p{
-  margin-top: 20px;
+p {
+  margin-top: 40px;
 }
-span{
+span {
   color: #333;
   font-size: 26px;
 }
+.outWork {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .outWorkL{
+    width: 62%;
+    text-align: center;
+    h3{
+      font-size: 28px;
+    }
+    .outWorkL_down{
+      display: flex;
+      justify-content: space-between;
+      .outWorkL_down_l{
+        .outLbox{
+          width: 350px;
+          height: 85px;
+          background-color: rgba(124, 163, 255, 1);
+          margin: 20px 20px;
+          border: 1px solid #000;
+          border-radius: 10px;
+          line-height: 85px;
+          font-size: 26px;
+          color: #fff;
+          text-align: center;
+        }
+      }
+      .outWorkL_down_r{
+        flex: 1;
+        li{
+          height: 50px;
+          line-height: 50px;
+          font-size: 26px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          position: relative;
+          .l::before{
+            content: '';
+            position: absolute;
+            left: -12px;
+            top: 20px;
+            width: 6px;
+            height: 6px;
+            background: #000;
+            border-radius: 50%;
+        }
+        }
+      }
+    }
+  }
+  .outWorkR{
+
+  }
+}
+
 </style>