src/components/Pagination/index.vue

@@ -40,7 +40,7 @@ export default {
     },
     layout: {
       type: String,
-      default: 'total, sizes, prev, pager, next, jumper'
+      default: 'total, sizes, ->,prev, pager, next, jumper'
     },
     background: {
       type: Boolean,

src/router/index.js

@@ -71,28 +71,6 @@ export const constantRoutes = [
   //   }]
   // },
 
-  {
-    path: '/mock',
-    component: Layout,
-    redirect: '/mock/interface',
-    name: 'Mock',
-    meta: { title: 'Mock服务', icon: 'example' },
-    children: [
-      {
-        path: 'interface',
-        name: 'Interface',
-        component: () => import('@/views/mock/interface'),
-        meta: { title: 'Mock服务', icon: 'interface' }
-      }
-      // {
-      //   path: 'interface/:rule',
-      //   name: 'Rule',
-      //   component: () => import('@/views/mock/rule'),
-      //   meta: { title: '规则', icon: 'rule' }
-      // }
-    ]
-  },
-
   {
     path: '/env-platform',
     component: Layout,
@@ -150,6 +128,28 @@ export const constantRoutes = [
       }
     ]
   },
+
+  {
+    path: '/mock',
+    component: Layout,
+    redirect: '/mock/interface',
+    name: 'Mock',
+    meta: { title: '服务Mock', icon: 'example' },
+    children: [
+      {
+        path: 'interface',
+        name: 'Interface',
+        component: () => import('@/views/mock/interface'),
+        meta: { title: '接口', icon: 'interface' }
+      },
+      {
+        path: 'interface/:rule',
+        name: 'Rule',
+        component: () => import('@/views/mock/rule'),
+        meta: { title: '规则', icon: 'rule' }
+      }
+    ]
+  },
   // {
   //   path: '/form',
   //   component: Layout,

src/views/home/floatMenu.vue

@@ -5,8 +5,8 @@
       <div class="QRCode-title">钉钉客服群</div>
       <el-image :src="imgUrl" style="margin: 0" />
     </el-card>
-    <div class="div-button-feedback" @click="feedBackClick" @mouseover="display = 'display: block;';feedbackClassName = 'Float_icon_反馈_蓝色'"><svg-icon :icon-class="feedbackClassName" /></div>
-    <el-card class="feedback" :style="display">
+    <div class="div-button-feedback" @click="feedBackClick" @mouseover="feedbackClassName = 'Float_icon_反馈_蓝色'" @mouseout="feedbackDisplay === 'display: none;'?feedbackClassName = 'Float_icon_反馈':feedbackClassName = 'Float_icon_反馈_蓝色'"><svg-icon :icon-class="feedbackClassName" /></div>
+    <el-card class="feedback" :style="feedbackDisplay">
       <div style="font-size: 12pt;color: #666666;display: inline-block">意见反馈</div>
       <div style="float: right;display: inline-block;" @click="feedBackClose"><svg-icon icon-class="float_反馈_icon_close" /></div><br>
       <div style="display:inline-block;font-size: 10pt;color: #666666;margin-top: 20pt">反馈类型</div>
@@ -115,7 +115,7 @@ export default {
     feedBackClick() {
       if (this.display === 'display: none;') {
         this.feedbackClassName = 'Float_icon_反馈_蓝色'
-        this.display = 'display: block;'
+        this.feedbackDisplay = 'display: block;'
       } else {
         this.feedBackClose()
       }

src/views/home/index.vue

@@ -1,13 +1,14 @@
 <template>
-  <div style="height: 1395pt">
+  <div :style="{height: screenHeight,width: screenWidth}">
     <el-menu
+      :style="{width: screenWidth}"
       mode="horizontal"
       :background-color="menuColor"
       text-color="#FFF"
       active-text-color="#FFF"
       @select="handleSelect"
     >
-      <el-image class="logo" :src="logoImage" fit="fill" />
+      <el-image class="logo" :src="logoImage" fit="scale-down" />
       <el-menu-item style="margin-left: 18.5%" index="1">环境平台</el-menu-item>
       <el-menu-item index="2">服务mock</el-menu-item>
       <el-menu-item index="3" disabled>数据中心</el-menu-item>
@@ -27,8 +28,8 @@
       </div>
     </el-menu>
     <div style="color: #FFFF">
-      <div class="div-introduction"><img class="image-title" style="width:36%" src="@/assets/home_images/banner_title@3x.png"><br><span style="font-size: 17pt">打造让每个研发测试都离不开的一站式综合工具平台</span></div>
-      <img class="img-arrow" src="@/assets/home_images/banner_icon_arrow@3x.png">
+      <div class="div-introduction"><img class="image-title" style="width: 470px" src="@/assets/home_images/banner_title@3x.png"><br><span style="font-size: 17pt">打造让每个研发测试都离不开的一站式综合工具平台</span></div>
+      <img class="img-arrow" style="width: 30px" src="@/assets/home_images/banner_icon_arrow@3x.png">
       <el-image style="width: 100%;z-index: -1;" :src="bannerImage" fit="scale-down" />
     </div>
     <div class="div-main" style="height: 600pt;width 100%;text-align: center;">
@@ -66,17 +67,17 @@
       </el-card>
     </div>
     <div style="height: 180pt;width 100%;background-color: #1B2341;">
-      <div class="div-footer1" style="margin-top: 45pt;margin-left: 15.3%;">
+      <div class="div-footer1" style="margin-top: 45pt;margin-left: 165pt;">
         <div>Thoth综合测试平台</div>
         <span style="margin-top: 18pt">普惠质量技术部 效率工具FT</span>
         <br>
         <span>© 2019. All Rights Reserved</span>
       </div>
-      <div class="div-footer2" style="margin-top: 45pt;margin-left: 55%;">
+      <div class="div-footer2" style="width: 600px;margin-top: 45pt;margin-left: 595pt;">
         <div style="visibility: hidden;">1</div>
         <span style="margin-top: 18pt">服务mock-赵福贵</span>
         <span>数据中心-王丽莎</span>
-        <span>FT负责人-叶宏刚</span>
+        <span>FT负责人-叶宏钢</span>
         <br>
         <span>虚拟硬件-魏洁文</span>
         <span>环境平台-李嘉嘉/刘青</span>
@@ -94,7 +95,7 @@
 <style scoped>
 .logo {
   position: absolute;
-  width: 7.5%;
+  width: 100px;
   left: 7.8%;
   top: 18%;
 }
@@ -136,7 +137,7 @@ div.div-footer1 > span {
 div.div-footer2 > span {
   margin-bottom: 10px;
   display: inline-block;
-  width: 180px;
+  width: 30%;
   font-size: 10.5pt;
   font-weight: normal;
   color: #FFFFFF;
@@ -146,7 +147,6 @@ div.div-footer2 > span {
   height: 68px;
   position: fixed;
   z-index: 10;
-  width: 100%;
 }
 .el-menu-item {
   padding-top: 1.5pt;
@@ -168,7 +168,7 @@ div.div-footer2 > span {
 }
 .el-card {
   display: inline-block;
-  width: 222pt;
+  width: 22%;
   height: 180pt;
   margin-left: 56pt;
   text-align: center;
@@ -251,11 +251,22 @@ export default {
       logoImage: logoImage,
       bannerImage: bannerImage,
       processManage: true,
-      realname: '未登录'
+      realname: '未登录',
+      screenWidth: '100%',
+      screenHeight: '1395pt'
     }
   },
   mounted() {
     window.addEventListener('scroll', this.handleScroll, true)
+    window.onresize = () => {
+      return (() => {
+        if (document.body.clientWidth < 1300) {
+          this.screenWidth = '1300px'
+        } else {
+          this.screenWidth = '100%'
+        }
+      })()
+    }
     getUserInfo()
       .then(res => {
         this.realname = res.data.realname

src/views/mock/interface.vue

@@ -1,13 +1,14 @@
 <template>
   <div class="app-container">
-    <el-header>
-      <div class="filter-container">
+    <el-header height="130px">
+      <div class="filter-container" style="text-align: center">
         <el-input v-model="listQuery.id" placeholder="ID" style="width: 80px;" class="filter-item" @keyup.enter.native="handleFilter" />
         <el-input v-model="listQuery.customName" placeholder="服务名" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
         <el-input v-model="listQuery.interfaceName" placeholder="接口类" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
         <el-input v-model="listQuery.methodName" placeholder="方法名" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
         <el-input v-model="listQuery.serviceVersion" placeholder="版本" style="width: 100px;" class="filter-item" @keyup.enter.native="handleFilter" />
         <el-input v-model="listQuery.methodStatus" placeholder="状态" style="width: 80px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        <br>
         <!-- <el-select v-model="listQuery.importance" placeholder="接口类" clearable style="width: 90px" class="filter-item">
           <el-option v-for="item in importanceOptions" :key="item" :label="item" :value="item" />
         </el-select>
@@ -33,13 +34,12 @@
       :key="tableKey"
       v-loading="listLoading"
       :data="list"
-      border
       fit
       highlight-current-row
       style="width: 100%;"
       @sort-change="sortChange"
     >
-      <el-table-column label="ID" prop="id" sortable="custom" align="center" width="60">
+      <el-table-column label="ID" prop="id" sortable align="center" width="60">
         <template slot-scope="scope">
           <span>{{ scope.row.id }}</span>
         </template>
@@ -191,6 +191,9 @@
 </template>
 
 <style scoped>
+.filter-item {
+  margin-top: 10px;
+}
 </style>
 
 <script>